diff options
| author | Jeremy Soller <jackpot51@gmail.com> | 2024-02-10 15:01:28 +0000 |
|---|---|---|
| committer | Jeremy Soller <jackpot51@gmail.com> | 2024-02-10 15:01:28 +0000 |
| commit | be4db6b21330438e48ef6bd1943db072095d787c (patch) | |
| tree | b53033d98c0eb6fd1a7acf935350705bc715ee56 | |
| parent | 0aec2332db9ce84b016adeaf83128f294ea1bf69 (diff) | |
| parent | 3f58996f32affb640b619ef6a91e9077415135de (diff) | |
Merge branch 'fuse3-everywhere' into 'master'
Use `fusermount3` everywhere
See merge request redox-os/redox!1426
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | bootstrap.sh | 1 | ||||
| -rw-r--r-- | podman/redox-base-containerfile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de5c465..e4130ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ before_script: build-essential \ curl \ flex \ - fuse \ + fuse3 \ git \ libfuse-dev \ nasm \ diff --git a/bootstrap.sh b/bootstrap.sh index f116b77..10c1e0c 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -389,6 +389,7 @@ ubuntu() doxygen \ file \ flex \ + fuse3 \ g++ \ genisoimage \ git \ diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index 9d54500..53d4e70 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -12,7 +12,7 @@ RUN apt-get update \ curl \ file \ flex \ - fuse \ + fuse3 \ genisoimage \ git \ gperf \ |