diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-05-10 10:13:23 +0100 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-05-10 10:13:23 +0100 |
commit | 58e631d01823afd60e52f3a09887f270a91889a0 (patch) | |
tree | 6afbca5492c1ad1040608e01fe0c9d909482adeb /cmds-scrub.c | |
parent | cec572daccafa1e912cbed363df6f84687778c6f (diff) |
New upstream release 4.5.2.
* Thanks for NMU of package rename.
* New upstream release 4.5.2.
* Upload using dgit.
* Source-only upload.
* btrfs-convert should not be included in the initramfs, but should be
compiled. Using btrfs-convert is not a trivial operation, and
especially not from a minimal shell. Also it is known to fail, and for
a sophisticated user it is trivial to include it in the
initramfs. Thus won't fix Closes: #801192
* No sponsorship required Closes: #823474
* Add Provides btrfs-tools-udeb to the -progs-udeb package.
Diffstat (limited to 'cmds-scrub.c')
-rw-r--r-- | cmds-scrub.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmds-scrub.c b/cmds-scrub.c index da614f2f..de7005c1 100644 --- a/cmds-scrub.c +++ b/cmds-scrub.c @@ -1591,10 +1591,12 @@ static int cmd_scrub_cancel(int argc, char **argv) int fdmnt = -1; DIR *dirstream = NULL; - if (check_argc_exact(argc, 2)) + clean_args_no_options(argc, argv, cmd_scrub_cancel_usage); + + if (check_argc_exact(argc - optind, 1)) usage(cmd_scrub_cancel_usage); - path = argv[1]; + path = argv[optind]; fdmnt = open_path_or_dev_mnt(path, &dirstream, 1); if (fdmnt < 0) { |