From fd0c8cdba5bb3f9b5551e7e5d5c572adc0dc440c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 18 Nov 2023 06:15:57 +0900 Subject: [PATCH 1/3] mounts_sshfs.bats: avoid passing "atime" The "atime" mount option is no longer recognized since FUSE 3.15 https://github.com/libfuse/libfuse/commit/dba6b3983af34f30de01cf532dff0b66f0ed6045 (Fedora 38 uses FUSE 3.14.1, Fedora 39 uses FUSE 3.16.1) Signed-off-by: Akihiro Suda --- tests/integration/mounts_sshfs.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/mounts_sshfs.bats b/tests/integration/mounts_sshfs.bats index 0bef01784f3..7503f0ca7c9 100644 --- a/tests/integration/mounts_sshfs.bats +++ b/tests/integration/mounts_sshfs.bats @@ -36,7 +36,7 @@ function setup_sshfs() { mkdir -p "$DIR" # Make sure we clear all superblock flags to make sure bind-mounts can # unset these flags. - if ! $sshfs -o rw,suid,dev,exec,atime rootless@localhost: "$DIR"; then + if ! $sshfs -o rw,suid,dev,exec rootless@localhost: "$DIR"; then # fallback to tmpfs if running in without sshfs mount -t tmpfs -o rw,suid,dev,exec,diratime,strictatime tmpfs "$DIR" fi From 1febeb4215057b8f342fd160e3668b55ca7805f1 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 18 Nov 2023 06:17:58 +0900 Subject: [PATCH 2/3] mounts_sshfs.bats: attempt fusermount3 before fusermount `fusermount` is missing on recent distros Signed-off-by: Akihiro Suda --- tests/integration/mounts_sshfs.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/mounts_sshfs.bats b/tests/integration/mounts_sshfs.bats index 7503f0ca7c9..c487b25e22f 100644 --- a/tests/integration/mounts_sshfs.bats +++ b/tests/integration/mounts_sshfs.bats @@ -10,7 +10,7 @@ function teardown() { if [ -v DIR ]; then # Some distros do not have fusermount installed # as a dependency of fuse-sshfs, and good ol' umount works. - fusermount -u "$DIR" || umount "$DIR" + fusermount3 -u "$DIR" || fusermount -u "$DIR" || umount "$DIR" unset DIR fi From 81d5e6fdcf073526c362527e4c15844e3b644430 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 18 Nov 2023 05:32:45 +0900 Subject: [PATCH 3/3] Vagrantfile.fedora: upgrade Fedora to 39 Signed-off-by: Akihiro Suda --- Vagrantfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile.fedora b/Vagrantfile.fedora index b1e3d628894..1f9c8f0da44 100644 --- a/Vagrantfile.fedora +++ b/Vagrantfile.fedora @@ -3,7 +3,7 @@ Vagrant.configure("2") do |config| # Fedora box is used for testing cgroup v2 support - config.vm.box = "fedora/38-cloud-base" + config.vm.box = "fedora/39-cloud-base" config.vm.provider :virtualbox do |v| v.memory = 2048 v.cpus = 2