From cc63a90dc81aa24c5693a807628c0ecef2eedf8f Mon Sep 17 00:00:00 2001 From: Mike Makonnen Date: Mon, 5 May 2008 06:31:41 +0000 Subject: o Change the warning dialog for the 'W' command in both the label and partition editors to reflect the fact that this is a stand-alone application, not sysinstall(8). o Change an instance of sade(8) refering to itself as sysinstall(8) in a confirmation dialog. MFC after: 1 week --- usr.sbin/sade/disks.c | 11 ++++------- usr.sbin/sade/label.c | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index ef39f74951a8..9a9048b0ec5f 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -566,13 +566,10 @@ diskPartition(Device *dev) break; case 'W': - if (!msgNoYes("WARNING: This should only be used when modifying an EXISTING\n" - "installation. If you are installing FreeBSD for the first time\n" - "then you should simply type Q when you're finished here and your\n" - "changes will be committed in one batch automatically at the end of\n" - "these questions. If you're adding a disk, you should NOT write\n" - "from this screen, you should do it from the label editor.\n\n" - "Are you absolutely sure you want to do this now?")) { + if (!msgNoYes("WARNING: You are about to modify an EXISTING installation.\n" + "You should simply type Q when you are finished\n" + "here and write to the disk from the label editor.\n\n" + "Are you absolutely sure you want to continue?")) { variable_set2(DISK_PARTITIONED, "yes", 0); #ifdef PC98 diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index 423de620d5ad..ac3994a7da02 100644 --- a/usr.sbin/sade/label.c +++ b/usr.sbin/sade/label.c @@ -1276,14 +1276,11 @@ diskLabel(Device *dev) if (!variable_cmp(DISK_LABELLED, "written")) { msgConfirm("You've already written out your changes - if you\n" "wish to overwrite them, you'll have to restart\n" - "sysinstall first."); + "sade first."); } - else if (!msgNoYes("WARNING: This should only be used when modifying an EXISTING\n" - "installation. If you are installing FreeBSD for the first time\n" - "then you should simply type Q when you're finished here and your\n" - "changes will be committed in one batch automatically at the end of\n" - "these questions.\n\n" - "Are you absolutely sure you want to do this now?")) { + else if (!msgNoYes("WARNING: You are about to modify an EXISTING\n" + "installation.\n\n" + "Are you absolutely sure you want to continue?")) { variable_set2(DISK_LABELLED, "yes", 0); diskLabelCommit(NULL); } -- cgit v1.2.3