Skip to content

Commit

Permalink
Moving overwriting of /bin/mount with /bin/mount.util-linux for httpf…
Browse files Browse the repository at this point in the history
…s to make it active (Closes: #707116).
  • Loading branch information
daniel-baumann committed May 8, 2013
1 parent 5fdb3a6 commit 69a2504
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
6 changes: 0 additions & 6 deletions scripts/boot/9990-main.sh
Expand Up @@ -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

Expand Down
7 changes: 7 additions & 0 deletions scripts/boot/9990-mount-http.sh
Expand Up @@ -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" ; } )"
Expand Down

0 comments on commit 69a2504

Please sign in to comment.