From d3776992876e94745921b56583d493c0e6d9c7a8 Mon Sep 17 00:00:00 2001 From: bmah Date: Tue, 4 Sep 2001 21:06:48 +0000 Subject: 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 --- usr.sbin/sysinstall/installUpgrade.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'usr.sbin/sysinstall/installUpgrade.c') 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) { -- cgit v1.1