summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbmah <bmah@FreeBSD.org>2001-09-04 21:06:48 +0000
committerbmah <bmah@FreeBSD.org>2001-09-04 21:06:48 +0000
commitd3776992876e94745921b56583d493c0e6d9c7a8 (patch)
tree6ffaff6e601aa206dd20ddf15d6c9dbb1350c1b2 /usr.sbin
parenta0573bd4e5a902cd47a0b3aa34f8434c1da8ff08 (diff)
downloadFreeBSD-src-d3776992876e94745921b56583d493c0e6d9c7a8.zip
FreeBSD-src-d3776992876e94745921b56583d493c0e6d9c7a8.tar.gz
sysinstall's binary upgrade option used to display the contents of
UPGRADE.TXT along with a YesNo dialog requesting confirmation of the upgrade. During the transition to RELNOTESng, UPGRADE.TXT got folded into a file that eventually renders as INSTALL.TXT, which makes sysinstall complain about a non-existent file. As a solution/workaround, point the user at INSTALL.TXT, and then request confirmation. Noticed by: rpratt (on 4.4-RC3) Approved by: jkh
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sysinstall/installUpgrade.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index 953dbe8..1ed44c8 100644
--- a/usr.sbin/sysinstall/installUpgrade.c
+++ b/usr.sbin/sysinstall/installUpgrade.c
@@ -165,10 +165,12 @@ installUpgrade(dialogMenuItem *self)
variable_set2(SYSTEM_STATE, "upgrade", 0);
dialog_clear();
- systemDisplayHelp("UPGRADE");
- 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)
+ if (msgYesNo("Before beginning a binary upgrade, please review the upgrade instructions,\n"
+ "which are located in the \"Install\" document under the main documentation\n"
+ "menu. Given that you have read these instructions and understand the risks\n"
+ "and precautions involved, are you sure that you want to proceed with\n"
+ "this upgrade?") != 0)
return DITEM_FAILURE;
if (!Dists) {
OpenPOWER on IntegriCloud