emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

umount: fix "umount -t FSTYPE MNTPOINT" acting as if -a is specified

Browse Source 
While at it, add -t to --help, and fix comments which say that -t is ignored

function                                             old     new   delta
packed_usage                                       32427   32444     +17
umount_main                                          558     552      -6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 17/-6)              Total: 11 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-02-20 17:58:19 +01:00
parent a84db18fc7
commit b083e8cc53
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util-linux/umount.c
View File

@ -57,6 +57,7 @@
//usage: IF_FEATURE_MOUNT_LOOP( //usage: IF_FEATURE_MOUNT_LOOP(
//usage: "\n -d Free loop device if it has been used" //usage: "\n -d Free loop device if it has been used"
//usage: ) //usage: )
//usage: "\n -t FSTYPE[,...] Unmount only these filesystem type(s)"
//usage: //usage:
//usage:#define umount_example_usage //usage:#define umount_example_usage
//usage: "$ umount /dev/hdc1\n" //usage: "$ umount /dev/hdc1\n"
@ -81,8 +82,8 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
} }
#endif #endif
/* ignored: -c -v -t -i */ /* ignored: -c -v -i */
#define OPTION_STRING "fldnra" "cvt:i" #define OPTION_STRING "fldnrat:" "cvi"
#define OPT_FORCE (1 << 0) // Same as MNT_FORCE #define OPT_FORCE (1 << 0) // Same as MNT_FORCE
#define OPT_LAZY (1 << 1) // Same as MNT_DETACH #define OPT_LAZY (1 << 1) // Same as MNT_DETACH
#define OPT_FREELOOP (1 << 2) #define OPT_FREELOOP (1 << 2)
@ -143,7 +144,8 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
} }
// If we're not umounting all, we need at least one argument. // If we're not umounting all, we need at least one argument.
if (!(opt & OPT_ALL) && !fstype) { // Note: "-t FSTYPE" does not imply -a.
if (!(opt & OPT_ALL)) {
if (!argv[0]) if (!argv[0])
bb_show_usage(); bb_show_usage();
m = NULL; m = NULL;