summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Cernekee <cernekee@gmail.com>2010-09-23 15:58:48 -0700
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-09-24 11:50:21 +0300
commit1ad9740c950474b2bb81941ca9aed1f8a20357d3 (patch)
treed4893af9d75c1980581554bd417d974c55d9a546
parent6358c55bacb813395a4612b9f3972bf41a3daed2 (diff)
mkfs.ubifs: Fix --squash-rino-perm / --nosquash-rino-perm
This addresses a couple of issues: 1) Code was only allowing these options if --root was NOT specified (the opposite of the documented usage) 2) -q / -Q short options did not work 3) Spacing fixes in the error/warning strings Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--mkfs.ubifs/mkfs.ubifs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c
index ec38f0e..d83f6bd 100644
--- a/mkfs.ubifs/mkfs.ubifs.c
+++ b/mkfs.ubifs/mkfs.ubifs.c
@@ -132,7 +132,7 @@ static struct inum_mapping **hash_table;
/* Inode creation sequence number */
static unsigned long long creat_sqnum;
-static const char *optstring = "d:r:m:o:D:h?vVe:c:g:f:P:k:x:X:j:R:l:j:U";
+static const char *optstring = "d:r:m:o:D:h?vVe:c:g:f:P:k:x:X:j:R:l:j:UQq";
static const struct option longopts[] = {
{"root", 1, NULL, 'r'},
@@ -698,8 +698,8 @@ static int get_options(int argc, char**argv)
return err_msg("Maximum count of LEBs was not specified "
"(use -h for help)");
- if (squash_rino_perm != -1 && root)
- return err_msg("--squash-rino-perm and nosquash-rino-perm options"
+ if (squash_rino_perm != -1 && !root)
+ return err_msg("--squash-rino-perm and nosquash-rino-perm options "
"can be used only with the --root option");
if (c->max_bud_bytes == -1) {
@@ -1673,7 +1673,7 @@ static int write_data(void)
if (squash_rino_perm == -1) {
printf("WARNING: setting root UBIFS inode UID=GID=0 (root) and permissions "
"to u+rwx,go+rx; use --squash-rino-perm or --nosquash-rino-perm "
- "to suppress this warning");
+ "to suppress this warning\n");
squash_rino_perm = 1;
}
if (squash_rino_perm) {