From: Karel Zak <kzak@redhat.com>
Date: Tue, 15 Jul 2014 11:12:23 +0000 (+0200)
Subject: cfdisk: fix warning usage, improve 's' help
X-Git-Tag: v2.25~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33f7c502c62c7e0ed5362c352d6f43a61d159b7f;p=thirdparty%2Futil-linux.git

cfdisk: fix warning usage, improve 's' help

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 7fc9a2c5a8..06cfcab805 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -1617,7 +1617,7 @@ static int ui_help(void)
 		N_("  n          Create new partition from free space"),
 		N_("  q          Quit program without writing partition table"),
 		N_("  t          Change the partition type"),
-		N_("  s          Fix partitions order"),
+		N_("  s          Fix partitions order (only when in disarray)"),
 		N_("  W          Write partition table to disk (must enter upper case W)"),
 		N_("             Since this might destroy data on the disk, you must"),
 		N_("             either confirm or deny the write by entering `yes' or"),
@@ -1795,7 +1795,7 @@ static int main_menu_action(struct cfdisk *cf, int key)
 		int rc;
 
 		if (fdisk_context_is_readonly(cf->cxt)) {
-			ui_warnx(_("Device open in read-only mode"));
+			warn = _("Device open in read-only mode");
 			break;
 		}