From 69a2504ef668f71120f801e2f3ba445c64644559 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2013 08:38:26 +0200 Subject: [PATCH] Moving overwriting of /bin/mount with /bin/mount.util-linux for httpfs to make it active (Closes: #707116). --- scripts/boot/9990-main.sh | 6 ------ scripts/boot/9990-mount-http.sh | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index 682959d..8776a7d 100755 --- a/scripts/boot/9990-main.sh +++ b/scripts/boot/9990-main.sh @@ -32,12 +32,6 @@ Live () . /conf/param.conf fi - if [ -n "${FUSE_MOUNT}" ] - then - # fuse does not work with klibc mount - ln -f /bin/mount.util-linux /bin/mount - fi - # Needed here too because some things (*cough* udev *cough*) # changes the timeout diff --git a/scripts/boot/9990-mount-http.sh b/scripts/boot/9990-mount-http.sh index b557404..935e0ae 100755 --- a/scripts/boot/9990-mount-http.sh +++ b/scripts/boot/9990-mount-http.sh @@ -50,6 +50,13 @@ do_httpmount () else FUSE_MOUNT="httpfs" fi + + if [ -n "${FUSE_MOUNT}" ] + then + # fuse does not work with klibc mount + ln -f /bin/mount.util-linux /bin/mount + fi + modprobe fuse $FUSE_MOUNT "${url}" "${dest}" ROOT_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )" -- 2.1.4