summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Cosoleto2011-08-17 00:19:04 +0200
committerKarel Zak2011-08-30 10:54:37 +0200
commit9777759ad67014273a1499fe4c55544434157eab (patch)
tree85cbeb5725695c011deb7916aca10d361d8e8479
parentfdisk: print partition deleted message (diff)
downloadkernel-qcow2-util-linux-9777759ad67014273a1499fe4c55544434157eab.tar.gz
kernel-qcow2-util-linux-9777759ad67014273a1499fe4c55544434157eab.tar.xz
kernel-qcow2-util-linux-9777759ad67014273a1499fe4c55544434157eab.zip
fdisk: print welcome message
This adds a welcome message with util-linux version number, information about fdisk behaviour that doesn't write to disk after a command (unlike gparted) and a warning about possible data loss. The message appears just before the first command prompt. Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
-rw-r--r--fdisk/fdisk.c10
-rw-r--r--fdisk/fdisksgilabel.c4
-rw-r--r--fdisk/fdisksunlabel.c4
3 files changed, 7 insertions, 11 deletions
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index d3fc20010..1c1f49211 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -932,11 +932,7 @@ static void
create_doslabel(void) {
unsigned int id = get_random_id();
- fprintf(stderr,
- _("Building a new DOS disklabel with disk identifier 0x%08x.\n"
- "Changes will remain in memory only, until you decide to write them.\n"
- "After that, of course, the previous content won't be recoverable.\n\n"),
- id);
+ fprintf(stderr, _("Building a new DOS disklabel with disk identifier 0x%08x.\n"), id);
sun_nolabel(); /* otherwise always recognised as sun */
sgi_nolabel(); /* otherwise always recognised as sgi */
disklabel = DOS_LABEL;
@@ -3093,6 +3089,10 @@ main(int argc, char **argv) {
disklabel = DOS_LABEL;
}
+ fprintf(stderr, _("Welcome to fdisk (%s).\n\n"
+ "Changes will remain in memory only, until you decide to write them.\n"
+ "Be careful before using the write command.\n"), PACKAGE_STRING);
+
while (1) {
putchar('\n');
c = tolower(read_char(_("Command (m for help): ")));
diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index 359590916..091902ab0 100644
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -698,9 +698,7 @@ create_sgilabel(void)
sec_fac = sector_size / 512; /* determine the sector factor */
fprintf(stderr,
- _("Building a new SGI disklabel. Changes will remain in memory only,\n"
- "until you decide to write them. After that, of course, the previous\n"
- "content will be unrecoverably lost.\n\n"));
+ _("Building a new SGI disklabel.\n"));
other_endian = (BYTE_ORDER == LITTLE_ENDIAN);
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index 7d3aa09e1..80408dd10 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -189,9 +189,7 @@ void create_sunlabel(void)
int res;
fprintf(stderr,
- _("Building a new sun disklabel. Changes will remain in memory only,\n"
- "until you decide to write them. After that, of course, the previous\n"
- "content won't be recoverable.\n\n"));
+ _("Building a new Sun disklabel.\n"));
#if BYTE_ORDER == LITTLE_ENDIAN
other_endian = 1;
#else