summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1998-03-21 02:08:52 +0000
committerjkh <jkh@FreeBSD.org>1998-03-21 02:08:52 +0000
commitae412a3109e0a2f7ec85f4d46cccb9915e8bdbe9 (patch)
treeb6c1bdbd56d794f9ec29b6f731c7aac456e6e4e7 /release
parent7561a961836c21b2269101ac2698772ce9d75d71 (diff)
downloadFreeBSD-src-ae412a3109e0a2f7ec85f4d46cccb9915e8bdbe9.zip
FreeBSD-src-ae412a3109e0a2f7ec85f4d46cccb9915e8bdbe9.tar.gz
MF22: install correct kernel
Diffstat (limited to 'release')
-rw-r--r--release/sysinstall/installUpgrade.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c
index ab4337a..ea7b9d2 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.53 1997/10/12 16:21:15 jkh Exp $
+ * $Id: installUpgrade.c,v 1.54 1997/10/29 07:47:06 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -203,7 +203,7 @@ installUpgrade(dialogMenuItem *self)
return DITEM_FAILURE;
}
else {
- /* Enable all the drives befor we start */
+ /* Enable all the drives before we start */
for (i = 0; i < cnt; i++)
devs[i]->enabled = TRUE;
}
@@ -274,15 +274,16 @@ installUpgrade(dialogMenuItem *self)
if (file_readable("/kernel")) {
msgNotify("Moving old kernel to /kernel.prev");
- if (system("chflags noschg /kernel && mv /kernel /kernel.prev")) {
+ if (system("mv /kernel /kernel.prev")) {
if (!msgYesNo("Hmmm! I couldn't move the old kernel over! Do you want to\n"
"treat this as a big problem and abort the upgrade? Due to the\n"
"way that this upgrade process works, you will have to reboot\n"
"and start over from the beginning. Select Yes to reboot now"))
systemShutdown(1);
}
- else /* Give us a working kernel in case we crash and reboot */
- system("cp /kernel.prev /kernel");
+ else
+ msgConfirm("NOTICE: Your old kernel is in /kernel.prev should this upgrade\n"
+ "fail for any reason and you need to boot your old kernel");
}
}
OpenPOWER on IntegriCloud