diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-12 16:43:21 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-12-12 16:43:55 +0100 |
| commit | f3516a60521a22d13df05ac4b5289ebe7616a389 (patch) | |
| tree | 0948af6db888c502c7316f04e1c1382628a1fda2 /scripts/boot | |
| parent | bb0bb603ed3011e83727f89d89c27be4d2309a5a (diff) | |
| download | live-boot-f3516a60521a22d13df05ac4b5289ebe7616a389.tar.gz live-boot-f3516a60521a22d13df05ac4b5289ebe7616a389.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/boot')
| -rwxr-xr-x | scripts/boot/9990-cmdline-old | 5 | ||||
| -rwxr-xr-x | scripts/boot/9990-main.sh | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old index 94c5163..85f1b62 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 |