X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F12fstab;h=b5b5602ca9e993d12efa79bee46b8dca68500cf9;hb=4328832d0d00e2d8f6608ae6db2e8a70a4a8571e;hp=fa9c64238b1714df5a327508c46d95edc1442487;hpb=9fc9e2a1a11b0edada38cb501fefe4f58aa414ac;p=live-boot-grml.git

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index fa9c642..b5b5602 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -1,31 +1,44 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Configuring fstab..."
-FSTAB=/root/etc/fstab
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Configuring fstab..."
+
+# live-initramfs script
 
-cat > $FSTAB <<EOF
-unionfs / unionfs rw 0 0
+FSTAB=/root/etc/fstab
+
+cat >> $FSTAB << EOF
+${UNIONTYPE} / ${UNIONTYPE} rw 0 0
 tmpfs /tmp tmpfs nosuid,nodev 0 0
 EOF
 
-rm -f /root/etc/rcS.d/S*checkroot.sh
+# disabled for now
+#rm -f /root/etc/rcS.d/S*checkroot.sh
+
+if [ "${NOFASTBOOT}" != "Yes" ]
+then
+	touch root/fastboot
+fi
 
 log_end_msg