X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fboot%2F9990-fstab.sh;h=5ae9546ab927de2a61dc9e7f409666fcef0d3297;hb=807aa6389f094accf58d6b4b654679d1dcbc84aa;hp=7f5459fa779110dcf0a9a4658bc8057c4dda35ed;hpb=2e70d7be610c9e45787c37352d36241de3c155d7;p=live-boot-grml.git

diff --git a/scripts/boot/9990-fstab.sh b/scripts/boot/9990-fstab.sh
index 7f5459f..5ae9546 100755
--- a/scripts/boot/9990-fstab.sh
+++ b/scripts/boot/9990-fstab.sh
@@ -6,32 +6,23 @@ Fstab ()
 {
 	# FIXME: stop hardcoding overloading of initramfs-tools functions
 	. /scripts/functions
-	. /lib/live/boot/initramfs-tools.sh
+	. /lib/live/boot/9990-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}"
+	if ! grep -qs  "^${UNIONTYPE}" /root/etc/fstab.d/live
 	then
-		echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> "${_FSTAB}"
+		echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab.d/live
 	fi
 
-	if ! grep -qs "^tmpfs /tmp" "${_FSTAB}"
+	if ! grep -qs "^tmpfs /tmp" /root/etc/fstab.d/live
 	then
-		echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${_FSTAB}"
+		echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab.d/live
 	fi
 
 	log_end_msg