summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-12 16:43:21 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-06 13:54:13 +0200
commit69f09ebf1e8cd94608496ae11121a31e0cc24a6f (patch)
tree9d50391536e8bc5059ae0f2adadc0a54e80e71e1 /scripts
parent19c72d400121fec31ca4dfa5f44998510460225b (diff)
downloadlive-boot-69f09ebf1e8cd94608496ae11121a31e0cc24a6f.tar.gz
live-boot-69f09ebf1e8cd94608496ae11121a31e0cc24a6f.zip
Making overwriting of /bin/mount within initramfs with mount.util-linux dependent on fuse usage, not on some additional boot parameter.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/boot/9990-cmdline-old5
-rwxr-xr-xscripts/boot/9990-main.sh2
2 files changed, 1 insertions, 6 deletions
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