36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
diff --git i/src/builder-context.c w/src/builder-context.c
|
||
|
|
index bf699fff..5412166f 100644
|
||
|
|
--- i/src/builder-context.c
|
||
|
|
+++ w/src/builder-context.c
|
||
|
|
@@ -834,7 +834,7 @@ static char *rofiles_unmount_path = NULL;
|
||
|
|
static void
|
||
|
|
rofiles_umount_handler (int signum)
|
||
|
|
{
|
||
|
|
- char *argv[] = { "fusermount", "-uz", NULL,
|
||
|
|
+ char *argv[] = { "fusermount3", "-uz", NULL,
|
||
|
|
NULL };
|
||
|
|
|
||
|
|
argv[2] = rofiles_unmount_path;
|
||
|
|
@@ -974,7 +974,7 @@ gboolean
|
||
|
|
builder_context_disable_rofiles (BuilderContext *self,
|
||
|
|
GError **error)
|
||
|
|
{
|
||
|
|
- char *argv[] = { "fusermount", "-u", NULL,
|
||
|
|
+ char *argv[] = { "fusermount3", "-u", NULL,
|
||
|
|
NULL };
|
||
|
|
|
||
|
|
if (!self->use_rofiles)
|
||
|
|
diff --git i/tests/libtest.sh w/tests/libtest.sh
|
||
|
|
index 3536e922..3b148ec4 100644
|
||
|
|
--- i/tests/libtest.sh
|
||
|
|
+++ w/tests/libtest.sh
|
||
|
|
@@ -296,7 +296,7 @@ run_sh () {
|
||
|
|
# fuse support is needed (and the kernel module needs to be loaded) for several
|
||
|
|
# flatpak-builder tests
|
||
|
|
skip_without_fuse () {
|
||
|
|
- if [ ! -w /dev/fuse ] || ! command -v fusermount >/dev/null; then
|
||
|
|
+ if [ ! -w /dev/fuse ] || ! command -v fusermount3 >/dev/null; then
|
||
|
|
echo "1..0 # SKIP this test requires fuse support"
|
||
|
|
exit 0
|
||
|
|
fi
|