From: Daniel Baumann <daniel@debian.org>
Date: Wed, 12 Dec 2012 15:43:21 +0000 (+0100)
Subject: Making overwriting of /bin/mount within initramfs with mount.util-linux dependent... 
X-Git-Tag: debian/4.0_a4-1~11
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=69f09ebf1e8cd94608496ae11121a31e0cc24a6f;hp=19c72d400121fec31ca4dfa5f44998510460225b;p=live-boot-grml.git

Making overwriting of /bin/mount within initramfs with mount.util-linux dependent on fuse usage, not on some additional boot parameter.
---

diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old
index 16fc206..b8fc4a6 100755
--- a/scripts/boot/9990-cmdline-old
+++ b/scripts/boot/9990-cmdline-old
@@ -30,11 +30,6 @@ Cmdline_old ()
 				export DHCP
 				;;
 
-			klibc-mount=*)
-				KLIBC_MOUNT="${_PARAMETER#klibc-mount=}"
-				export KLIBC_MOUNT
-				;;
-
 			ethdevice=*)
 				DEVICE="${_PARAMETER#ethdevice=}"
 				ETHDEVICE="${DEVICE}"
diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 0924581..c696781 100755
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -32,7 +32,7 @@ Main ()
 		. /conf/param.conf
 	fi
 
-	if [ -x /bin/mount.util-linux ] && [ -z "${KLIBC_MOUNT}" ]
+	if [ -n "${FUSE_MOUNT}" ]
 	then
 		# fuse does not work with klibc mount
 		ln -f /bin/mount.util-linux /bin/mount