From: Daniel Baumann <daniel@debian.org>
Date: Thu, 26 Mar 2009 13:06:37 +0000 (+0100)
Subject: Correcting fstab handling to not always append entries forever when using persistency.
X-Git-Tag: debian/1.157.2-1~10
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=inline;h=16c64362bf6d8457b9af296ef71bc6973109b802;p=live-boot-grml.git

Correcting fstab handling to not always append entries forever when using persistency.
---

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index f38eee7..d246a59 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -32,17 +32,27 @@ log_begin_msg "Configuring fstab"
 
 # live-initramfs script
 
-# Create a fake fstab only if it is not already there
+# Create a fake fstab only if it doesn't exist or if its the debootstrap template
 if [ ! -f "${FSTAB}" ] || grep -qs 'UNCONFIGURED FSTAB FOR BASE SYSTEM' "${FSTAB}"
 then
-	cat >> ${FSTAB} << EOF
+
+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
+
+if ! grep -qs  "^${UNIONTYPE}" "${FSTAB}"
+then
+	echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> "${FSTAB}"
+fi
+
+if ! grep -qs "^tmpfs /tmp" "${FSTAB}"
+then
+	echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
 fi
 
 # disabled for now