Adding upstream version 1.157.1.

[live-boot-grml.git] / scripts / live-bottom / 12fstab

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index ca83626..f38eee7 100755 (executable)
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -28,23 +28,22 @@ then
        exit 0
 fi
 
-if [ -s ${FSTAB} ]
-then
-       log_begin_msg "Not touching preexisting fstab..."
-else
-       log_begin_msg "Configuring fstab..."
-
-       cat >> ${FSTAB} <<-EOF
-       # /etc/fstab: static file system information.
-       #
-       # <file system> <mount point>   <type>  <options>       <dump>  <pass>
-       ${UNIONTYPE} / ${UNIONTYPE} rw 0 0
-       tmpfs /tmp tmpfs nosuid,nodev 0 0
-       EOF
-fi
+log_begin_msg "Configuring fstab"
 
 # live-initramfs script
 
+# Create a fake fstab only if it is not already there
+if [ ! -f "${FSTAB}" ] || grep -qs 'UNCONFIGURED FSTAB FOR BASE SYSTEM' "${FSTAB}"
+then
+       cat >> ${FSTAB} << EOF
+# /etc/fstab: static file system information.
+#
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>
+
+${UNIONTYPE} / ${UNIONTYPE} rw 0 0
+tmpfs /tmp tmpfs nosuid,nodev 0 0
+EOF
+fi
 
 # disabled for now
 #rm -f /root/etc/rcS.d/S*checkroot.sh