summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-03-26 14:06:37 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:04 +0100
commit10af87f0f8566c5913d60330fccec6bcc402faea (patch)
treeb63cef56e8a205f3189dfc363c4ef699f0c41ec7 /scripts
parent03910a6b80ac98d0d1386c9a2d891d2d95193f8b (diff)
downloadlive-boot-10af87f0f8566c5913d60330fccec6bcc402faea.tar.gz
live-boot-10af87f0f8566c5913d60330fccec6bcc402faea.zip
Correcting fstab handling to not always append entries forever when using persistency.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live-bottom/12fstab18
1 files changed, 14 insertions, 4 deletions
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