projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correcting handling of locale default and environment handling to not always append...
[live-boot-grml.git]
/
scripts
/
live-bottom
/
12fstab
diff --git
a/scripts/live-bottom/12fstab
b/scripts/live-bottom/12fstab
index
f38eee7
..
d246a59
100755
(executable)
--- a/
scripts/live-bottom/12fstab
+++ b/
scripts/live-bottom/12fstab
@@
-32,17
+32,27
@@
log_begin_msg "Configuring fstab"
# live-initramfs script
# live-initramfs script
-# Create a fake fstab only if it
is not already ther
e
+# Create a fake fstab only if it
doesn't exist or if its the debootstrap templat
e
if [ ! -f "${FSTAB}" ] || grep -qs 'UNCONFIGURED FSTAB FOR BASE SYSTEM' "${FSTAB}"
then
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>
# /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
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
fi
# disabled for now