projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.110.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
12fstab
diff --git
a/scripts/live-bottom/12fstab
b/scripts/live-bottom/12fstab
index
fa9c642
..
3d036c9
100755
(executable)
--- a/
scripts/live-bottom/12fstab
+++ b/
scripts/live-bottom/12fstab
@@
-1,31
+1,49
@@
#!/bin/sh
#!/bin/sh
-PREREQ=""
-DESCRIPTION="Configuring fstab..."
-FSTAB=/root/etc/fstab
+#set -e
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
prereqs()
{
prereqs()
{
- echo "$
PREREQ
"
+ echo "$
{PREREQ}
"
}
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
-cat > $FSTAB <<EOF
-unionfs / unionfs rw 0 0
+if [ -n "${NOFSTAB}" ]
+then
+ exit 0
+fi
+
+log_begin_msg "Configuring fstab..."
+
+# live-initramfs script
+
+FSTAB=/root/etc/fstab
+
+cat >> ${FSTAB} << EOF
+${UNIONTYPE} / ${UNIONTYPE} rw 0 0
tmpfs /tmp tmpfs nosuid,nodev 0 0
EOF
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
log_end_msg