flatpak/repos/extra-x86_64/fusermount3.diff

   1 diff --git i/common/flatpak-dir.c w/common/flatpak-dir.c
   2 index 84816389..b99a7304 100644
   3 --- i/common/flatpak-dir.c
   4 +++ w/common/flatpak-dir.c
   5 @@ -2109,7 +2109,7 @@ flatpak_dir_revokefs_fuse_unmount (OstreeRepo **repo,
   6
   7    fusermount = g_subprocess_new (G_SUBPROCESS_FLAGS_NONE,
   8                                   error,
   9 -                                 "fusermount", "-u", "-z", mnt_dir,
  10 +                                 "fusermount3", "-u", "-z", mnt_dir,
  11                                   NULL);
  12    if (g_subprocess_wait_check (fusermount, NULL, error))
  13      {
  14 diff --git i/tests/can-use-fuse.c w/tests/can-use-fuse.c
  15 index fb6e2000..759f0d84 100644
  16 --- i/tests/can-use-fuse.c
  17 +++ w/tests/can-use-fuse.c
  18 @@ -53,23 +53,23 @@ check_fuse (void)
  19        return FALSE;
  20      }
  21
  22 -  fusermount = g_find_program_in_path ("fusermount");
  23 +  fusermount = g_find_program_in_path ("fusermount3");
  24
  25    if (fusermount == NULL)
  26      {
  27 -      cannot_use_fuse = g_strdup ("fusermount not found in PATH");
  28 +      cannot_use_fuse = g_strdup ("fusermount3 not found in PATH");
  29        return FALSE;
  30      }
  31
  32    if (!g_file_test (fusermount, G_FILE_TEST_IS_EXECUTABLE))
  33      {
  34        cannot_use_fuse = g_strdup_printf ("%s not executable", fusermount);
  35        return FALSE;
  36      }
  37
  38    if (!g_file_test ("/etc/mtab", G_FILE_TEST_EXISTS))
  39      {
  40 -      cannot_use_fuse = g_strdup ("fusermount won't work without /etc/mtab");
  41 +      cannot_use_fuse = g_strdup ("fusermount3 won't work without /etc/mtab");
  42        return FALSE;
  43      }
  44
  45 diff --git i/tests/libtest.sh w/tests/libtest.sh
  46 index 36d39ac4..e78d94ca 100644
  47 --- i/tests/libtest.sh
  48 +++ w/tests/libtest.sh
  49 @@ -542,7 +542,7 @@ skip_one_without_bwrap () {
  50  }
  51
  52  skip_without_fuse () {
  53 -    fusermount --version >/dev/null 2>&1 || skip "no fusermount"
  54 +    fusermount3 --version >/dev/null 2>&1 || skip "no fusermount3"
  55
  56      capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \
  57          skip "No cap_sys_admin in bounding set, can't use FUSE"
  58 @@ -608,7 +608,7 @@ commit_to_path () {
  59  cleanup () {
  60      /bin/kill -9 $DBUS_SESSION_BUS_PID
  61      gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye >&2 || true
  62 -    fusermount -u $XDG_RUNTIME_DIR/doc >&2 || :
  63 +    fusermount3 -u $XDG_RUNTIME_DIR/doc >&2 || :
  64      kill $(jobs -p) &> /dev/null || true
  65      if test -n "${TEST_SKIP_CLEANUP:-}"; then
  66          echo "# Skipping cleanup of ${TEST_DATA_DIR}"