ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Karel Zak 2014-01-06 09:02:36 +01:00
parent d640dd9421
commit 961d69f799
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys-utils/losetup.8
View File

@ -46,8 +46,6 @@ Setup loop device:
.RB [ \-\-sizelimit
.IR size ]
.in +8
.RB [ \-p
.IR pfd ]
.RB [ \-rP ]
.RB { \-f [ \-\-show ]| \fIloopdev\fP }
.I file

6
sys-utils/losetup.c
View File

@ -451,7 +451,6 @@ int main(int argc, char **argv)
{ "offset", 1, 0, 'o' },
{ "output", 1, 0, 'O' },
{ "sizelimit", 1, 0, OPT_SIZELIMIT },
{ "pass-fd", 1, 0, 'p' },
{ "partscan", 0, 0, 'P' },
{ "read-only", 0, 0, 'r' },
{ "raw", 0, 0, OPT_RAW },
@ -477,7 +476,7 @@ int main(int argc, char **argv)
if (loopcxt_init(&lc, 0))
err(EXIT_FAILURE, _("failed to initialize loopcxt"));
while ((c = getopt_long(argc, argv, "ac:d:De:E:fhj:lno:O:p:PrvV",
while ((c = getopt_long(argc, argv, "ac:d:De:E:fhj:lno:O:PrvV",
longopts, NULL)) != -1) {
err_exclusive_options(c, longopts, excl, excl_st);
@ -537,9 +536,6 @@ int main(int argc, char **argv)
outarg = optarg;
list = 1;
break;
case 'p':
warn(_("--pass-fd is no longer supported"));
break;
case 'P':
lo_flags |= LO_FLAGS_PARTSCAN;
break;

8
sys-utils/mount.c
View File

@ -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);