-
Notifications
You must be signed in to change notification settings - Fork 225
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'v1.47.2-rc1' into debian/master
v1.47.2-rc1
- Loading branch information
Showing
40 changed files
with
1,629 additions
and
1,111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| #!/bin/sh | ||
| usage() { | ||
| printf 'usage: %s [-hv] [-o ro|force|allow_others[,...]]... device|image mountpoint\n\nUse fuse2fs instead.\n' "${0##*/}" | ||
| exit 9 | ||
| } | ||
|
|
||
| args="$(getopt -o 'hvo:' --long 'help,verbose,options:' -n "${0##*/}" -s 'sh' -- "$@")" || exit | ||
| eval set -- "$args" | ||
|
|
||
| original_options= | ||
| readonly= | ||
| force= | ||
| while :; do | ||
| case "$1" in | ||
| -o|--options) | ||
| original_options="$original_options,$2" | ||
| shift 2 | ||
| ;; | ||
| -h|--help) | ||
| usage | ||
| shift | ||
| ;; | ||
| -v|--verbose) | ||
| shift | ||
| ;; | ||
| --) | ||
| shift | ||
| break | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
| [ $# -eq 2 ] || usage | ||
| device="$1" | ||
| mountpoint="$2" | ||
|
|
||
| # let fuse2fs check $device | ||
|
|
||
| options= | ||
| while [ -n "${original_options#,}" ]; do | ||
| original_options="${original_options#,}" | ||
| full="${original_options%%,*}" | ||
| original_options="${original_options#*,}," | ||
| case "${full%%=*}" in | ||
| "ro" ) readonly=y ;; # Read-only mount. | ||
| "rw" ) readonly= ;; # Read-write mount | ||
| "rw+" ) readonly=; force=y ;; # Read-write mount | ||
| "silent") ;; # keep silent | ||
| "force" ) force=y ;; # enable read/write | ||
| * ) options="$options,$full"; continue ;; | ||
| esac | ||
| [ "$full" = "${full%=*}" ] || { | ||
| printf '%s: %s: value given but not allowed\n' "${0##*/}" "$full" >&2 | ||
| exit 254 | ||
| } | ||
| done | ||
|
|
||
| [ -z "$readonly" ] && [ -z "$force" ] && { | ||
| printf '%s: Mounting %s Read-Only. Use '\''force'\'' or '\''rw+'\'' options to enable Read-Write mode\n' "${0##*/}" "$device" >&2 | ||
| readonly=y | ||
| } | ||
|
|
||
| [ -n "$readonly" ] && options="$options,ro" || options="$options,rw" | ||
|
|
||
| exec /usr/bin/fuse2fs "$device" "$mountpoint" -o "${options#,}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| .\" SPDX-License-Identifier: 0BSD | ||
| .\" | ||
| .Dd October 24, 2024 | ||
| .Dt FUSE-EXT2 1 | ||
| .Os fuse2fs | ||
| . | ||
| .Sh NAME | ||
| .Nm fuse-ext2 | ||
| .Nd fuse2fs compatibility wrapper | ||
| .Sh SYNOPSIS | ||
| .Nm | ||
| .Op Fl hv | ||
| .Oo Fl o Cm ro Ns \&| Ns Cm force Ns \&| Ns Cm allow_others Ns Oo ,… Oc Oc Ns … | ||
| .Ar device Ns \&| Ns Ar image | ||
| .Ar mountpoint | ||
| . | ||
| .Sh DESCRIPTION | ||
| This wrapper provides the | ||
| .Nm | ||
| interface via | ||
| .Xr fuse2fs 1 , | ||
| which you should migrate to instead. | ||
| . | ||
| .Sh OPTIONS | ||
| .Bl -tag -compact -width ".Fl o , -options Ar option Ns Op ,…" | ||
| .It Fl h , -help | ||
| Show usage string. | ||
| . | ||
| .It Fl v , -verbose | ||
| Ignored. | ||
| . | ||
| .It Fl o , -options Ar option Ns Op ,… | ||
| .Xr mount.fuse3 8 | ||
| options, of which these are handled specially: | ||
| .Bl -tag -compact -offset 4n -width ".Cm silent" | ||
| .It Cm ro | ||
| Mount read-only. | ||
| . | ||
| .It Cm rw | ||
| Mount read-write | ||
| .Em if | ||
| .Cm force | ||
| also given. | ||
| This is the default. | ||
| . | ||
| .It Cm rw+ | ||
| Same as | ||
| .Fl o Cm rw , Ns Cm force | ||
| .It Cm silent | ||
| Ignored. | ||
| .It Cm force | ||
| If | ||
| .Cm rw , | ||
| mount read-write. | ||
| .El | ||
| all other | ||
| .Ar option Ns s | ||
| are forwarded to | ||
| .Nm fuse2fs | ||
| directly. | ||
| .Pp | ||
| If | ||
| .Cm rw | ||
| but not | ||
| .Cm force , | ||
| the mount is read-only and a warning is issued. | ||
| .El |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| /usr/bin/fuse2fs | ||
| /usr/share/man/man1/fuse2fs.1 | ||
|
|
||
| debian/fuse-ext2 /usr/bin/ | ||
| debian/fuse-ext2.1 /usr/share/man/man1/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /usr/bin/fuse-ext2 /usr/bin/fuseext2 | ||
| /usr/bin/fuse-ext2 /usr/sbin/mount.fuse-ext2 | ||
| /usr/sbin/mount.fuse-ext2 /usr/sbin/mount.fuseext2 | ||
|
|
||
| /usr/share/man/man1/fuse-ext2.1 /usr/share/man/man1/fuseext2.1 | ||
| /usr/share/man/man1/fuse-ext2.1 /usr/share/man/man8/mount.fuse-ext2.8 | ||
| /usr/share/man/man8/mount.fuse-ext2.8 /usr/share/man/man8/mount.fuseext2.8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| include: | ||
| - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml | ||
| - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml |
Oops, something went wrong.