Be more cautious about leaving user with a workable kernel during the

upgrade process.
Submitted by:	Mikael Karpberg <karpen@ocean.campus.luth.se>

1 files changed, 7 insertions, 2 deletions

diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index d997533..8a755821 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.49 1997/05/09 07:44:19 jkh Exp $
+ * $Id: installUpgrade.c,v 1.50 1997/09/08 11:09:09 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -295,6 +295,8 @@ media:
 			      "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");
 	}
     }
 
@@ -444,7 +446,10 @@ installUpgradeNonInteractive(dialogMenuItem *self)
 
     if (file_readable("/kernel")) {
 	msgNotify("Moving old kernel to /kernel.prev");
-	system("chflags noschg /kernel && mv /kernel /kernel.prev");
+	if (!system("chflags noschg /kernel && mv /kernel /kernel.prev")) {
+	    /* Give us a working kernel in case we crash and reboot */
+	    system("cp /kernel.prev /kernel");
+	}
     }
 
     msgNotify("Beginning extraction of distributions..");