[SCM] live-boot branch, debian-next, updated. debian/3.0_a29-1-16-g4e60b81

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 4e60b814bfc4bb7966bc559d04f9c48c9dcae8af
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 5 19:15:10 2012 +0200

    Transforming fstab bottom script into normal live-boot script.

diff --git a/initramfs-tools/scripts/live-bottom/12fstab b/initramfs-tools/scripts/live-bottom/12fstab
deleted file mode 100755
index 871180c..0000000
--- a/initramfs-tools/scripts/live-bottom/12fstab
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-FSTAB=/root/etc/fstab
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-boot header
-
-# FIXME: stop hardcoding overloading of initramfs-tools functions
-. /scripts/functions
-. /lib/live/boot/initramfs-tools.sh
-
-if [ -n "${NOFSTAB}" ]
-then
-	exit 0
-fi
-
-log_begin_msg "Configuring fstab"
-
-# live-boot script
-
-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
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
+}

-- 
live-boot