ostree/trunk/ostree-2023.1-use_fuse3.patch

   1 diff --git i/docs/buildsystem-and-repos.md w/docs/buildsystem-and-repos.md
   2 index e265ee7a..2e9250d5 100644
   3 --- i/docs/buildsystem-and-repos.md
   4 +++ w/docs/buildsystem-and-repos.md
   5 @@ -151,7 +151,7 @@ rofiles-fuse exampleos-build mnt
   6  # Now run global "triggers", generate cache files:
   7  ldconfig -r mnt
   8    (Insert other programs here)
   9 -fusermount -u mnt
  10 +fusermount3 -u mnt
  11  ostree --repo=build-repo commit -b exampleos/x86_64/standard --link-checkout-speedup exampleos-build
  12  ```
  13
  14 diff --git i/man/rofiles-fuse.xml w/man/rofiles-fuse.xml
  15 index f4d23739..e8569130 100644
  16 --- i/man/rofiles-fuse.xml
  17 +++ w/man/rofiles-fuse.xml
  18 @@ -89,7 +89,7 @@ $ mkdir mnt/anewdir
  19  $ rm mnt/someoriginalcontent -rf
  20
  21  # Commit and cleanup
  22 -$ fusermount -u mnt
  23 +$ fusermount3 -u mnt
  24  $ ostree --repo=repo commit --link-checkout-speedup -b somebranch -s 'Commit new content' --tree=dir=branch-checkout
  25  $ rm mnt branch-checkout -rf
  26         </programlisting>
  27 diff --git i/tests/libtest.sh w/tests/libtest.sh
  28 index 264094b1..cd1e0986 100755
  29 --- i/tests/libtest.sh
  30 +++ w/tests/libtest.sh
  31 @@ -683,7 +683,7 @@ skip_one_without_strace_fault_injection() {
  32  }
  33
  34  skip_without_fuse () {
  35 -    fusermount --version >/dev/null 2>&1 || skip "no fusermount"
  36 +    fusermount3 --version >/dev/null 2>&1 || skip "no fusermount3"
  37
  38      capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \
  39          skip "No cap_sys_admin in bounding set, can't use FUSE"
  40 diff --git i/tests/test-demo-buildsystem.sh w/tests/test-demo-buildsystem.sh
  41 index 2dc78dc3..50995b87 100755
  42 --- i/tests/test-demo-buildsystem.sh
  43 +++ w/tests/test-demo-buildsystem.sh
  44 @@ -55,7 +55,7 @@ exampleos_recompose() {
  45      # Now that we have our rootfs, run triggers
  46      rofiles-fuse exampleos-build mnt
  47      demo_triggers mnt/
  48 -    fusermount -u mnt
  49 +    fusermount3 -u mnt
  50
  51      # Then we commit it, using --link-checkout-speedup to effectively
  52      # only re-checksum the ldconfig file.  We also have dummy commit
  53 diff --git i/tests/test-rofiles-fuse.sh w/tests/test-rofiles-fuse.sh
  54 index a56a76c6..c61945d6 100755
  55 --- i/tests/test-rofiles-fuse.sh
  56 +++ w/tests/test-rofiles-fuse.sh
  57 @@ -37,7 +37,7 @@ $OSTREE checkout -H test2 checkout-test2
  58
  59  rofiles-fuse checkout-test2 mnt
  60  cleanup_fuse() {
  61 -    fusermount -u ${test_tmpdir}/mnt || true
  62 +    fusermount3 -u ${test_tmpdir}/mnt || true
  63  }
  64  libtest_exit_cmds+=(cleanup_fuse)
  65  assert_file_has_content mnt/firstfile first
  66 @@ -133,7 +133,7 @@ echo "ok flock"
  67
  68  copyup_reset() {
  69      cd ${test_tmpdir}
  70 -    fusermount -u mnt
  71 +    fusermount3 -u mnt
  72      rm checkout-test2 -rf
  73      $OSTREE checkout -H test2 checkout-test2
  74      rofiles-fuse --copyup checkout-test2 mnt