diff --git a/bootstrap.sh b/bootstrap.sh index 462cfe4b310e9f2c30abdde6dc11044618c32dcf..8813f9db8459e8c85549434fcab9ba69c451a8b3 100755 --- a/bootstrap.sh +++ b/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 diff --git a/mk/config.mk b/mk/config.mk index 6a7a70d97459e2f5bc58a27211a9914846e30f01..cdd69bd8ca8e6eaef17d37aae5e1d28b357d4461 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -42,7 +42,13 @@ else ifeq ($(UNAME),FreeBSD) VBM=VBoxManage HOST_TARGET ?= $(HOST_ARCH)-unknown-freebsd else - FUMOUNT=fusermount -u + # 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 diff --git a/podman_bootstrap.sh b/podman_bootstrap.sh index d33f86e5594f9f47723aafeaa3071583bffd0438..47794a28f84d048ce124bbedfc747422a02f50f4 100755 --- a/podman_bootstrap.sh +++ b/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