Moving overwriting of /bin/mount with /bin/mount.util-linux for httpfs to make it...
authorDaniel Baumann <mail@daniel-baumann.ch>
Wed, 8 May 2013 06:38:26 +0000 (08:38 +0200)
committerDaniel Baumann <mail@daniel-baumann.ch>
Wed, 8 May 2013 06:39:37 +0000 (08:39 +0200)
scripts/boot/9990-main.sh
scripts/boot/9990-mount-http.sh

index 682959d..8776a7d 100755 (executable)
@@ -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
 
index b557404..935e0ae 100755 (executable)
@@ -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" ; } )"