diff options
| author | Karel Zak | 2014-01-06 09:02:36 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-01-06 09:02:36 +0100 |
| commit | 961d69f79973d60811c172caee6ce661f5d4cd31 (patch) | |
| tree | 380a28fac96cc83dcfb1ff1fe776f37d216c5e5a /sys-utils/mount.c | |
| parent | man: Syntax and spelling fixes. (diff) | |
| download | kernel-qcow2-util-linux-961d69f79973d60811c172caee6ce661f5d4cd31.tar.gz kernel-qcow2-util-linux-961d69f79973d60811c172caee6ce661f5d4cd31.tar.xz kernel-qcow2-util-linux-961d69f79973d60811c172caee6ce661f5d4cd31.zip | |
losetup, mount: remove --pass-fd at all
The option is unsupported since v2.23, let's cleanup man pages and
code to remove it at all.
Reported-by: "Dale R. Worley" <worley@alum.mit.edu>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/mount.c')
| -rw-r--r-- | sys-utils/mount.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys-utils/mount.c b/sys-utils/mount.c index ed814ca49..d2d1fdac8 100644 --- a/sys-utils/mount.c +++ b/sys-utils/mount.c @@ -803,7 +803,6 @@ int main(int argc, char **argv) { "rw", 0, 0, 'w' }, { "options", 1, 0, 'o' }, { "test-opts", 1, 0, 'O' }, - { "pass-fd", 1, 0, 'p' }, { "types", 1, 0, 't' }, { "uuid", 1, 0, 'U' }, { "label", 1, 0, 'L'}, @@ -846,12 +845,12 @@ int main(int argc, char **argv) mnt_context_set_tables_errcb(cxt, table_parser_errcb); - while ((c = getopt_long(argc, argv, "aBcfFhilL:Mno:O:p:rRsU:vVwt:T:", + while ((c = getopt_long(argc, argv, "aBcfFhilL:Mno:O:rRsU:vVwt:T:", longopts, NULL)) != -1) { /* only few options are allowed for non-root users */ if (mnt_context_is_restricted(cxt) && - !strchr("hlLUVvprist", c) && + !strchr("hlLUVvrist", c) && c != MOUNT_OPT_TARGET && c != MOUNT_OPT_SOURCE) exit_non_root(option_to_longopt(c, longopts)); @@ -901,9 +900,6 @@ int main(int argc, char **argv) if (mnt_context_set_options_pattern(cxt, optarg)) err(MOUNT_EX_SYSERR, _("failed to set options pattern")); break; - case 'p': - warnx(_("--pass-fd is no longer supported")); - break; case 'L': xasprintf(&srcbuf, "LABEL=\"%s\"", optarg); mnt_context_disable_swapmatch(cxt, 1); |