X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F12fstab;h=f38eee722f4fdcd1ed1c4b94b1d2b8698cffce4c;hb=34aedd0c9495e0f352eceb260896a1ec10e242b8;hp=389f53e983c6caab003b1ce86dd77e2efbadd3ce;hpb=cdb98bbbdc41b29c6b94dc5aed36393daec84cf8;p=live-boot-grml.git

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 389f53e..f38eee7 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -5,6 +5,7 @@
 # initramfs-tools header
 
 PREREQ=""
+FSTAB=/root/etc/fstab
 
 prereqs()
 {
@@ -22,17 +23,34 @@ esac
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring fstab..."
+if [ -n "${NOFSTAB}" ]
+then
+	exit 0
+fi
+
+log_begin_msg "Configuring fstab"
 
 # live-initramfs script
 
-FSTAB=/root/etc/fstab
+# 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>
 
-cat > $FSTAB <<EOF
-unionfs / unionfs rw 0 0
+${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
 
-rm -f /root/etc/rcS.d/S*checkroot.sh
+if [ "${NOFASTBOOT}" != "Yes" ]
+then
+	touch root/fastboot
+fi
 
 log_end_msg