summaryrefslogtreecommitdiff
path: root/cmds-rescue.c
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2016-05-10 10:13:23 +0100
committerDimitri John Ledkov <xnox@ubuntu.com>2016-05-10 10:13:23 +0100
commit58e631d01823afd60e52f3a09887f270a91889a0 (patch)
tree6afbca5492c1ad1040608e01fe0c9d909482adeb /cmds-rescue.c
parentcec572daccafa1e912cbed363df6f84687778c6f (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-rescue.c')
-rw-r--r--cmds-rescue.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds-rescue.c b/cmds-rescue.c
index 98954254..f597997b 100644
--- a/cmds-rescue.c
+++ b/cmds-rescue.c
@@ -67,8 +67,7 @@ static int cmd_rescue_chunk_recover(int argc, char *argv[])
}
}
- argc = argc - optind;
- if (check_argc_exact(argc, 1))
+ if (check_argc_exact(argc - optind, 1))
usage(cmd_rescue_chunk_recover_usage);
file = argv[optind];
@@ -133,8 +132,7 @@ static int cmd_rescue_super_recover(int argc, char **argv)
usage(cmd_rescue_super_recover_usage);
}
}
- argc = argc - optind;
- if (check_argc_exact(argc, 1))
+ if (check_argc_exact(argc - optind, 1))
usage(cmd_rescue_super_recover_usage);
dname = argv[optind];
@@ -165,6 +163,8 @@ static int cmd_rescue_zero_log(int argc, char **argv)
char *devname;
int ret;
+ clean_args_no_options(argc, argv, cmd_rescue_zero_log_usage);
+
if (check_argc_exact(argc, 2))
usage(cmd_rescue_zero_log_usage);