diff options
| -rw-r--r-- | DEPRECATED | 6 | ||||
| -rw-r--r-- | mount/lomount.c | 2 | ||||
| -rw-r--r-- | mount/losetup.8 | 10 |
3 files changed, 14 insertions, 4 deletions
diff --git a/DEPRECATED b/DEPRECATED index 6c209b87c..4bc79fed6 100644 --- a/DEPRECATED +++ b/DEPRECATED @@ -2,6 +2,12 @@ The following is a list of commands or features that are deprecated. All deprecated utils are in maintenace mode and we keep them in source tree for backward compatibilty only. +What: losetup -s +When: 2.15 +Why: the option -s is in collision with the Loop-AES losetup dialect that is used + in some distributions. Use the long version (--show) only. + +-------------------------- What: raw(8) command When: undefined yet; depends on kernel upstream diff --git a/mount/lomount.c b/mount/lomount.c index 953fe86b1..028986f56 100644 --- a/mount/lomount.c +++ b/mount/lomount.c @@ -840,7 +840,7 @@ usage(void) { " --sizelimit <num> loop limited to only <num> bytes of the file\n" " -p | --pass-fd <num> read passphrase from file descriptor <num>\n" " -r | --read-only setup read-only loop device\n" - " -s | --show print device name (with -f <file>)\n" + " --show print device name (with -f <file>)\n" " -v | --verbose verbose mode\n\n"), progname); exit(1); diff --git a/mount/losetup.8 b/mount/losetup.8 index c6ba75f16..8076dca77 100644 --- a/mount/losetup.8 +++ b/mount/losetup.8 @@ -41,7 +41,7 @@ Setup loop device: .IR pfd ] .RB [ \-r ] .in +8 -.RB { \-f [ \-s ] | \fIloop_device\fP } +.RB { \-f [ \-\-show ] | \fIloop_device\fP } .I file .in -13 .ad b @@ -94,12 +94,16 @@ read the passphrase from file descriptor with number instead of from the terminal .IP "\fB\-r, \-\-read-only\fP" setup read-only loop device -.IP "\fB\-s, \-\-show\fP" +.IP "\fB\-\-show\fP" print device name if the .I -f option and a .I file -argument are present +argument are present. + +The short form of this option (\fB\-s\fP) is deprecated. This short form could +be in collision with Loop-AES implementation where the same option is used for +\fB\-\-sizelimit\fP. .IP "\fB\-v, \-\-verbose\fP" verbose mode |