From: Daniel Reichelt <debian@nachtgeist.net>
Date: Sun, 16 Jul 2017 15:15:46 +0000 (+0200)
Subject: Use klibc's mount again for fuse mounts
X-Git-Tag: debian/1%20180328~24
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=6a5807fdd4cf67578a9715e17cbfc87c8c311955

Use klibc's mount again for fuse mounts

When building a stretch live image which includes httpfs/buster for the
created live-image's initramfs to support live-boot's httpfs switch, the
boot process fails in a way similar to what has been reported in #823856.

Special handling for ${FUSE_MOUNT}s (httpfs, curlftps) was added to use
util-linux's mount instead of the klibc's in such cases. I tested the
use of a FUSE-based rootfs in conjunction with klibc's mount, and it
seems, nowadays the both of them work together.

So, the conditional incorporation and replacement of the mount command
is both no longer necessary, and has become harmful.

Closes: #868559
---

diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index 8be2335..0e75e4d 100755
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -164,10 +164,6 @@ then
 	copy_exec /usr/bin/eject /bin
 fi
 
-# Program: mount
-# fuse does not work with klibc mount
-copy_exec /bin/mount /bin/mount.util-linux
-
 [ "${QUIET}" ] || echo -n " utils"
 
 # Feature: Verify Checksums
diff --git a/components/9990-mount-http.sh b/components/9990-mount-http.sh
index 2e68fe6..f58c3a3 100755
--- a/components/9990-mount-http.sh
+++ b/components/9990-mount-http.sh
@@ -54,12 +54,6 @@ do_httpmount ()
 							FUSE_MOUNT="httpfs"
 						fi
 
-						if [ -n "${FUSE_MOUNT}" ] && [ -x /bin/mount.util-linux ]
-						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" ; } )"