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 diff --git a/tests/integration/mounts_sshfs.bats b/tests/integration/mounts_sshfs.bats index 0bef01784f3..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 @@ -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