aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1998-11-30 13:31:08 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1998-11-30 13:31:08 +0000
commitd02569bb3d98320a4f678caa73c82eaf18cdd04d (patch)
tree3a9a26d1f24ba0ea7eaf7bbbb928b0b0da72e637
parent87d30e5f1242bc92c630a32f8b01db76dc6fa97a (diff)
Fix the message which is output before upgrading.
Notes
Notes: svn path=/stable/2.2/; revision=41423
-rw-r--r--release/sysinstall/installUpgrade.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c
index f4d8f18cd319..35e13ada53d6 100644
--- a/release/sysinstall/installUpgrade.c
+++ b/release/sysinstall/installUpgrade.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: installUpgrade.c,v 1.33.2.23 1998/11/05 17:47:42 jkh Exp $
+ * $Id: installUpgrade.c,v 1.33.2.24 1998/11/15 09:07:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -164,12 +164,8 @@ installUpgrade(dialogMenuItem *self)
return installUpgradeNonInteractive(self);
variable_set2(SYSTEM_STATE, "upgrade");
- systemDisplayHelp("UPGRADE");
dialog_clear_norefresh();
- if (msgYesNo("Given all that scary stuff you just read, are you sure you want to\n"
- "risk it all and proceed with this upgrade?") != 0)
- return DITEM_FAILURE | DITEM_RESTORE;
if (!Dists) {
msgConfirm("First, you must select some distribution components. The upgrade procedure\n"
@@ -193,6 +189,9 @@ installUpgrade(dialogMenuItem *self)
if (!(Dists & DIST_BIN))
extractingBin = FALSE;
+ if (msgYesNo("Last chance, are you sure you want to proceed with this upgrade?") != 0)
+ return DITEM_FAILURE | DITEM_RESTORE;
+
if (RunningAsInit) {
Device **devs;
int i, cnt;