summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-05-07 17:09:57 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-05-07 17:41:33 -0300
commitb340aae9b1390fbd8c41d0f66a7417f4e96770f9 (patch)
tree5b65a526373934b2aa8ebb0d40ab77ebe0c1a1cc
parent6033a1eaea2e2acf9f6200c6ee27fef88e76097e (diff)
downloadarchiso32-b340aae9b1390fbd8c41d0f66a7417f4e96770f9.tar.xz
[archiso] Update fstab and "source dev" of aufs.
* Change from none -> union (looks like util-linux is confused BUG?) Avoid the message: "umount aufs failed: not found" at shutdown. #1 mount -t tmpfs none /something #2 mount -t tmpfs xxxx /something The output of findmnt -rnu -o SOURCE will be blank in #1. * Change from aufs -> auto, make its more generic. * Update devpts and shm entries. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--archiso/hooks/archiso2
-rw-r--r--configs/syslinux-iso/overlay/etc/fstab10
2 files changed, 6 insertions, 6 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index 4a4239e..a129b20 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -127,7 +127,7 @@ archiso_mount_handler() {
msg "done."
msg ":: Mounting root (aufs) filesystem"
- /bin/mount -t aufs -o dirs=/rw_branch=rw none "${newroot}"
+ /bin/mount -t aufs -o dirs=/rw_branch=rw union "${newroot}"
if [ $? -ne 0 ]; then
echo "ERROR: while mounting root (aufs) filesystem."
launch_interactive_shell
diff --git a/configs/syslinux-iso/overlay/etc/fstab b/configs/syslinux-iso/overlay/etc/fstab
index 3c43a5e..b470b17 100644
--- a/configs/syslinux-iso/overlay/etc/fstab
+++ b/configs/syslinux-iso/overlay/etc/fstab
@@ -1,7 +1,7 @@
+#
# /etc/fstab: static file system information
+#
# <file system> <dir> <type> <options> <dump> <pass>
-aufs / aufs noauto 0 0
-none /dev/pts devpts defaults 0 0
-none /dev/shm tmpfs defaults 0 0
-
-### Auto generated entries get added here:
+union / auto noauto 0 0
+devpts /dev/pts devpts defaults 0 0
+shm /dev/shm tmpfs nodev,nosuid 0 0