Conditional creation of /etc/fstab.

* This is one of a series of interventions that means to be gentle to
debian-live builders and to persistence users; the rationale is that
if a file is present on the rootfs it does not need to be overwritten
from scratch since its presence means either a live-helper
configuration at build time or a persistent/snapshot at run time.

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index ee242a4..2dba37a 100755 (executable)
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -32,7 +32,10 @@ log_begin_msg "Configuring fstab"
 
 # live-initramfs script
 
-cat >> ${FSTAB} << EOF
+# Create a fake fstab only if it is not already there
+if [ ! -f "${FSTAB}" ] || grep -q 'UNCONFIGURED FSTAB FOR BASE SYSTEM' "${FSTAB}"
+then
+       cat >> ${FSTAB} << EOF
 # /etc/fstab: static file system information.
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
@@ -40,6 +43,7 @@ cat >> ${FSTAB} << EOF
 ${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