aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1998-03-21 02:08:52 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1998-03-21 02:08:52 +0000
commit40917faa6f2324767fba74b08d80fa7a4e7580d6 (patch)
treed6f79f6df7bd57d415ed89f7f8df6618c01b1cde /usr.sbin
parenta299349b09b68663d71bcf962bf3ce775e5d6e40 (diff)
downloadsrc-40917faa6f2324767fba74b08d80fa7a4e7580d6.tar.gz
src-40917faa6f2324767fba74b08d80fa7a4e7580d6.zip
MF22: install correct kernel
Notes
Notes: svn path=/head/; revision=34733
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sysinstall/installUpgrade.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index ab4337a193fe..ea7b9d262d5f 100644
--- a/usr.sbin/sysinstall/installUpgrade.c
+++ b/usr.sbin/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");
}
}