summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-06-05 19:15:10 +0200
committerDaniel Baumann <daniel@debian.org>2012-06-05 19:35:57 +0200
commitdd7bdeae993535b53b5a0209fca4d673a5789644 (patch)
tree2ad55459d65ce7bd6804e15f0f151d90ff894981 /scripts
parente41a83bca638500a899ef7e1d19e97ec723f1209 (diff)
downloadlive-boot-dd7bdeae993535b53b5a0209fca4d673a5789644.tar.gz
live-boot-dd7bdeae993535b53b5a0209fca4d673a5789644.zip
Transforming fstab bottom script into normal live-boot script.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/boot.sh1
-rwxr-xr-xscripts/boot/fstab.sh38
2 files changed, 39 insertions, 0 deletions
diff --git a/scripts/boot.sh b/scripts/boot.sh
index 4391a1e..1883950 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -636,6 +636,7 @@ mountroot ()
fi
persistence_exclude
+ fstab
maybe_break live-bottom
log_begin_msg "Running /scripts/live-bottom\n"
diff --git a/scripts/boot/fstab.sh b/scripts/boot/fstab.sh
new file mode 100755
index 0000000..7f5459f
--- /dev/null
+++ b/scripts/boot/fstab.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+#set -e
+
+Fstab ()
+{
+ # FIXME: stop hardcoding overloading of initramfs-tools functions
+ . /scripts/functions
+ . /lib/live/boot/initramfs-tools.sh
+
+ if [ -n "${NOFSTAB}" ]
+ then
+ return
+ fi
+
+ if [ -e /run ]
+ then
+ # wheezy
+ _FSTAB="/root/etc/fstab.d/live"
+ else
+ # squeeze
+ _FSTAB="/root/etc/fstab"
+ fi
+
+ log_begin_msg "Configuring fstab"
+
+ 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
+
+ log_end_msg
+}