Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-07-08 03:33:40 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-07-08 03:44:43 -0300
commit1fc3a61b75f4c4e49ccc4de0399b4f3e6823ad61 (patch)
tree2b586aa056d7beefb33cccfe8e3853c8c98e60b2 /archiso
parent1d9d75beb48cc8b6acf53a33094f931c0cae8b67 (diff)
archiso hook: umount /bootmnt if copytoram=y
More generic way than current method, and fix if logic (inverted). Takes the same actions independent of medium (disk/cdrom). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'archiso')
-rw-r--r--archiso/hooks/archiso14
1 files changed, 4 insertions, 10 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index ae98231..c7a6829 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -141,16 +141,10 @@ archiso_mount_handler() {
fi
done < "${isomounts}"
- # Bind our bootmnt dir into the live system
- _mnt_bind /bootmnt "${newroot}/bootmnt"
-
- if [ "${copytoram}" != "y" ]; then
- if [ "${FSTYPE}" = "iso9660" ] || [ "${FSTYPE}" = "udf" ]; then
- if [ -d /proc/sys/dev/cdrom ]; then
- echo 0 > /proc/sys/dev/cdrom/lock
- echo 0 > /proc/sys/dev/cdrom/autoeject
- fi
- fi
+ if [ "${copytoram}" = "y" ]; then
+ /bin/umount /bootmnt
+ else
+ _mnt_bind /bootmnt "${newroot}/bootmnt"
fi
}