Making overwriting of /bin/mount within initramfs with mount.util-lin…

…ux dependent on fuse usage, not on some additional boot parameter.
grml · May 6, 2013 · 69f09eb · 69f09eb
1 parent 19c72d4
commit 69f09eb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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