2 files changed, 9 insertions, 10 deletions

diff --git a/usr.sbin/sysinstall/doc.c b/usr.sbin/sysinstall/doc.c
index ef5be2f2683d..a52c659ed910 100644
--- a/usr.sbin/sysinstall/doc.c
+++ b/usr.sbin/sysinstall/doc.c
@@ -4,16 +4,12 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: doc.c,v 1.7 1995/10/27 01:22:53 jkh Exp $
+ * $Id: doc.c,v 1.8 1995/10/27 03:59:31 jkh Exp $
  *
  * Jordan Hubbard
  *
  * My contributions are in the public domain.
  *
- * Parts of this file are also blatently stolen from Poul-Henning Kamp's
- * previous version of sysinstall, and as such fall under his "BEERWARE license"
- * so buy him a beer if you like it!  Buy him a beer for me, too!
- * Heck, get him completely drunk and send me pictures! :-)
  */
 
 #include "sysinstall.h"
@@ -26,7 +22,13 @@ int
 docBrowser(char *junk)
 {
     char *browser = variable_get(VAR_BROWSER_PACKAGE);
- 
+
+    if (!strstr(variable_get(SYSTEM_STATE), "install")) {
+	msgConfirm("This option may only be used after the system is installed, sorry!");
+	return RET_FAIL;
+    }
+
+    /* Make sure we have media available */
     if (!mediaVerify())
 	return RET_FAIL;
 
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index da8641d7eafa..ff3b1207dab5 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.12 1995/10/27 03:59:38 jkh Exp $
+ * $Id: installUpgrade.c,v 1.13 1995/11/03 12:02:36 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -222,9 +222,6 @@ installUpgrade(char *str)
 	    return RET_FAIL;
     }
 
-    /* Note that we're now upgrading */
-    variable_set2(SYSTEM_STATE, "upgrade");
-
     dialog_clear();
     msgConfirm("OK.  First, we're going to go to the disk label editor.  In this editor\n"
 	       "you will be expected to *Mount* any partitions you're interested in\n"