Merge branch 'fix-fusermount-for-gentoo' into 'master'

Detect installed fusermount or fusermount3 binary

See merge request redox-os/redox!1322

bootstrap.sh

@@ -353,7 +353,7 @@ gentoo()
 		echo "Installing git..."
 		sudo emerge dev-vcs/git
 	fi
-	if [ -z "$(which fusermount)" ]; then
+	if [ -z "$(which fusermount 2>/dev/null)" ] && [ -z "$(which fusermount3 2>/dev/null)" ]; then
 		echo "Installing fuse..."
 		sudo emerge sys-fs/fuse
 	fi

mk/config.mk

@@ -41,8 +41,14 @@ else ifeq ($(UNAME),FreeBSD)
 	VB_AUDIO=pulse # To check, will probaly be OSS on most setups
 	VBM=VBoxManage
 	HOST_TARGET ?= $(HOST_ARCH)-unknown-freebsd
+else
+	# Detect which version of the fusermount binary is available.
+	ifneq (, $(shell which fusermount3))
+		FUMOUNT=fusermount3 -u
 	else
 		FUMOUNT=fusermount -u
+	endif
+
 	export NPROC=nproc
 	export REDOX_MAKE=make
 	VB_AUDIO=pulse

podman_bootstrap.sh

@@ -291,7 +291,7 @@ gentoo()
 		echo "Installing git..."
 		sudo emerge dev-vcs/git
 	fi
-	if [ -z "$(which fusermount)" ]; then
+	if [ -z "$(which fusermount 2>/dev/null)" ] && [ -z "$(which fusermount3 2>/dev/null)" ]; then
 		echo "Installing fuse..."
 		sudo emerge sys-fs/fuse
 	fi