diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-24 03:11:43 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-24 03:11:43 +0000 |
commit | 54d10059c93cdbacd709147c1bda45c2039059eb (patch) | |
tree | 20ea089eafe51723d93f28ed5b5ab7089bc2c9ff /e2fsprogs | |
parent | 4e12b1a2a9e68685dff61acaee1e1f6c377d978c (diff) | |
download | busybox-w32-54d10059c93cdbacd709147c1bda45c2039059eb.tar.gz busybox-w32-54d10059c93cdbacd709147c1bda45c2039059eb.tar.bz2 busybox-w32-54d10059c93cdbacd709147c1bda45c2039059eb.zip |
*: tweak error messages
sysctl: shrink; support recursing if name is a directory:
"sysctl net.ipv4.conf". Patch by xmaks AT email.cz
text data bss dec hex filename
793659 504 7492 801655 c3b77 busybox_old
793576 504 7492 801572 c3b24 busybox_unstripped
Diffstat (limited to 'e2fsprogs')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/e2fsck.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c index 741536c1c..b927a9f65 100644 --- a/e2fsprogs/old_e2fsprogs/e2fsck.c +++ b/e2fsprogs/old_e2fsprogs/e2fsck.c | |||
@@ -12632,7 +12632,7 @@ static void check_mount(e2fsck_t ctx) | |||
12632 | retval = ext2fs_check_if_mounted(ctx->filesystem_name, | 12632 | retval = ext2fs_check_if_mounted(ctx->filesystem_name, |
12633 | &ctx->mount_flags); | 12633 | &ctx->mount_flags); |
12634 | if (retval) { | 12634 | if (retval) { |
12635 | bb_error_msg(_("while determining whether %s is mounted."), | 12635 | bb_error_msg(_("while determining whether %s is mounted"), |
12636 | ctx->filesystem_name); | 12636 | ctx->filesystem_name); |
12637 | return; | 12637 | return; |
12638 | } | 12638 | } |
@@ -12653,7 +12653,7 @@ static void check_mount(e2fsck_t ctx) | |||
12653 | 12653 | ||
12654 | printf(_("%s is mounted. "), ctx->filesystem_name); | 12654 | printf(_("%s is mounted. "), ctx->filesystem_name); |
12655 | if (!ctx->interactive) | 12655 | if (!ctx->interactive) |
12656 | bb_error_msg_and_die(_("Cannot continue, aborting.")); | 12656 | bb_error_msg_and_die(_("cannot continue, aborting")); |
12657 | printf(_("\n\n\007\007\007\007WARNING!!! " | 12657 | printf(_("\n\n\007\007\007\007WARNING!!! " |
12658 | "Running e2fsck on a mounted filesystem may cause\n" | 12658 | "Running e2fsck on a mounted filesystem may cause\n" |
12659 | "SEVERE filesystem damage.\007\007\007\n\n")); | 12659 | "SEVERE filesystem damage.\007\007\007\n\n")); |
@@ -13060,7 +13060,7 @@ static errcode_t PRS(int argc, char **argv, e2fsck_t *ret_ctx) | |||
13060 | case 'a': | 13060 | case 'a': |
13061 | if (ctx->options & (E2F_OPT_YES|E2F_OPT_NO)) { | 13061 | if (ctx->options & (E2F_OPT_YES|E2F_OPT_NO)) { |
13062 | conflict_opt: | 13062 | conflict_opt: |
13063 | bb_error_msg_and_die(_("Only one the options -p/-a, -n or -y may be specified.")); | 13063 | bb_error_msg_and_die(_("only one the options -p/-a, -n or -y may be specified")); |
13064 | } | 13064 | } |
13065 | ctx->options |= E2F_OPT_PREEN; | 13065 | ctx->options |= E2F_OPT_PREEN; |
13066 | break; | 13066 | break; |
@@ -13405,7 +13405,7 @@ restart: | |||
13405 | #ifdef ENABLE_COMPRESSION | 13405 | #ifdef ENABLE_COMPRESSION |
13406 | /* FIXME - do we support this at all? */ | 13406 | /* FIXME - do we support this at all? */ |
13407 | if (sb->s_feature_incompat & EXT2_FEATURE_INCOMPAT_COMPRESSION) | 13407 | if (sb->s_feature_incompat & EXT2_FEATURE_INCOMPAT_COMPRESSION) |
13408 | bb_error_msg(_("Warning: compression support is experimental.")); | 13408 | bb_error_msg(_("warning: compression support is experimental")); |
13409 | #endif | 13409 | #endif |
13410 | #ifndef ENABLE_HTREE | 13410 | #ifndef ENABLE_HTREE |
13411 | if (sb->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) { | 13411 | if (sb->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) { |