summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Makonnen <mtm@FreeBSD.org>2008-05-05 06:31:41 +0000
committerMike Makonnen <mtm@FreeBSD.org>2008-05-05 06:31:41 +0000
commitcc63a90dc81aa24c5693a807628c0ecef2eedf8f (patch)
tree1f572b1c09fe9daad545fa5222b68a0b5f843487
parent967b36e864c6ec6ed87307e1e58bdf034c527a29 (diff)
downloadsrc-test2-cc63a90dc81aa24c5693a807628c0ecef2eedf8f.tar.gz
src-test2-cc63a90dc81aa24c5693a807628c0ecef2eedf8f.zip
Notes
-rw-r--r--usr.sbin/sade/disks.c11
-rw-r--r--usr.sbin/sade/label.c11
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);
}