YAMF22

7 files changed, 43 insertions, 42 deletions

diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index a6614eb..116b0c9 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id$
+ * $Id: install.c,v 1.172 1997/02/22 14:11:46 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -636,10 +636,8 @@ installCommit(dialogMenuItem *self)
 	    return DITEM_FAILURE | DITEM_RESTORE;
     }
 
-    if (!mediaDevice) {
-	if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
-	    return DITEM_FAILURE | DITEM_RESTORE;
-    }
+    if (!mediaVerify())
+	return DITEM_FAILURE | DITEM_RESTORE;
 
     str = variable_get(SYSTEM_STATE);
     if (isDebug())
@@ -657,7 +655,8 @@ try_media:
     if (!mediaDevice->init(mediaDevice)) {
 	if (!msgYesNo("Unable to initialize selected media. Would you like to\n"
 		      "adjust your media configuration and try again?")) {
-	    if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
+	    mediaDevice = NULL;
+	    if (!mediaVerify())
 		return DITEM_FAILURE | DITEM_RESTORE;
 	    else
 		goto try_media;
diff --git a/usr.sbin/sysinstall/help/fixit.hlp b/usr.sbin/sysinstall/help/fixit.hlp
index f959307..2ec1765 100644
--- a/usr.sbin/sysinstall/help/fixit.hlp
+++ b/usr.sbin/sysinstall/help/fixit.hlp
@@ -1,9 +1,9 @@
-A special shell will be launched by this option with a fixit Floppy
-mounted as /mnt2.  This provides access to extra commands under /mnt2
-as well as a more complete set of device files in /mnt2/dev.  Some device
-operations, like fsck and disklabel, may therefore require you to go to
-/mnt2/dev and use the entries there rather than assuming that they will be
-present in the default /dev (which came from the boot floppy and is very
-minimal).
+A special shell will be launched by this option with a fixit floppy
+(or 2nd CDROM) mounted as /mnt2.  This provides access to extra
+commands under /mnt2 as well as a more complete set of device files in
+/mnt2/dev.  Some device operations, like fsck and disklabel, may
+therefore require you to go to /mnt2/dev and use the entries there
+rather than assuming that they will be present in the default /dev
+(which came from the boot floppy and is very minimal).
 
 When you're done, exit the shell to reboot.
diff --git a/usr.sbin/sysinstall/help/tcp.hlp b/usr.sbin/sysinstall/help/tcp.hlp
index 2dccb2e..774bf2c 100644
--- a/usr.sbin/sysinstall/help/tcp.hlp
+++ b/usr.sbin/sysinstall/help/tcp.hlp
@@ -2,6 +2,8 @@ This screen allows you to set up your general network parameters
 (hostname, domain name, DNS server, etc) as well as the settings for a
 given interface (which was selected from the menu before this screen).
 
+PLIP/SLIP users - please read through to the end of this doc!
+
 You can move through the fields with the TAB, BACK-TAB and RETURN
 keys.  To edit a field, use DELETE or BACKSPACE.  You may also use ^A
 (control-A) to go to the beginning of the line, ^E (control-E) to go
@@ -10,18 +12,21 @@ to go backward one character, ^D (control-D) to delete the character
 under the cursor and ^K (control-K) to delete to the end of the line.
 Basically, the standard EMACS motion sequences.
 
-The ``Extra options to ifconfig'' is kind of special (read: a hack :-).
+The "Extra options to ifconfig" field is kind of special (read: a
+hack :-):
+
+If you're running SLIP or PLIP, you also need to use it for specifying
+the remote end of the link (simply type the foreign IP address in).
 
-You can use it for specifying the foreign side of a PLIP or SLIP line
-(simply type the foreign address in) as well as selecting a given
-"link" on an ethernet card that has more than one (e.g. AUI, 10BT,
-10B2, etc).  The following links are recognized:
+If you're dealing with an ethernet adaptor with multiple "link"
+connectors (e.g. AUI, 10BT, 10B2, etc), you can use this field to
+specify which one to use.  The following links are recognized:
 
         link0 - AUI * highest precedence
         link1 - BNC
         link2 - UTP * lowest precedence
 
 That is to say that you can enter one of "link0", "link1" or "link2"
-into the `Extra options' field to select a different link.
+into this field to select a different link.
 
 When you're done with this form, select OK.
diff --git a/usr.sbin/sysinstall/help/usage.hlp b/usr.sbin/sysinstall/help/usage.hlp
index 2e28f68..4f7dd1d 100644
--- a/usr.sbin/sysinstall/help/usage.hlp
+++ b/usr.sbin/sysinstall/help/usage.hlp
@@ -19,6 +19,7 @@ SHIFT-TAB       Move to previous item or group.
 LEFT ARROW      Move to previous item or group (same as SHIFT-TAB).
 PAGE UP         In text display boxes, scrolls up one page.
 PAGE DOWN       In text display boxes, scrolls down one page.
+F1              Display associated help text.
 
 If you see small "^(-)" or "v(+)" symbols at the edges of a menu, it
 means that there are more items above or below the current one that
@@ -32,6 +33,10 @@ Selecting OK in a menu will confirm whatever action it's controlling.
 Selecting Cancel will cancel the operation and generally return you to
 the previous menu.
 
+Most screens have Help - READ IT!  It generally offers
+context-specific hints on what to do next, and if you're confused at
+any point, hit the F1 key for tips on what to do next.
+
 
 SPECIAL FEATURES:
 =================
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index a6614eb..116b0c9 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id$
+ * $Id: install.c,v 1.172 1997/02/22 14:11:46 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -636,10 +636,8 @@ installCommit(dialogMenuItem *self)
 	    return DITEM_FAILURE | DITEM_RESTORE;
     }
 
-    if (!mediaDevice) {
-	if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
-	    return DITEM_FAILURE | DITEM_RESTORE;
-    }
+    if (!mediaVerify())
+	return DITEM_FAILURE | DITEM_RESTORE;
 
     str = variable_get(SYSTEM_STATE);
     if (isDebug())
@@ -657,7 +655,8 @@ try_media:
     if (!mediaDevice->init(mediaDevice)) {
 	if (!msgYesNo("Unable to initialize selected media. Would you like to\n"
 		      "adjust your media configuration and try again?")) {
-	    if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
+	    mediaDevice = NULL;
+	    if (!mediaVerify())
 		return DITEM_FAILURE | DITEM_RESTORE;
 	    else
 		goto try_media;
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index c7cc42c..76711d0 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$
+ * $Id: installUpgrade.c,v 1.44 1997/02/07 04:26:16 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -242,17 +242,16 @@ installUpgrade(dialogMenuItem *self)
 	systemCreateHoloshell();
     }
 
-    if (!mediaVerify()) {
-	msgConfirm("Now you must specify an installation medium for the upgrade.");
 media:
-	if (!dmenuOpenSimple(&MenuMedia, FALSE) || !mediaDevice)
-	    return DITEM_FAILURE | DITEM_RESTORE;
-    }
+    if (!mediaVerify())
+	return DITEM_FAILURE | DITEM_RESTORE;
 
     if (!mediaDevice->init(mediaDevice)) {
 	if (!msgYesNo("Couldn't initialize the media.  Would you like\n"
-		   "to adjust your media selection and try again?"))
+		   "to adjust your media selection and try again?")) {
+	    mediaDevice = NULL;
 	    goto media;
+	}
 	else
 	    return DITEM_FAILURE | DITEM_REDRAW;
     }
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index 5906ca8..3b0f231 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id$
+ * $Id: media.c,v 1.80 1997/02/22 14:11:57 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -675,21 +675,15 @@ mediaExtractDist(char *dir, char *dist, FILE *fp)
 int
 mediaGetType(dialogMenuItem *self)
 {
-    int i;
-
-    i = dmenuOpenSimple(&MenuMedia, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE;
-    return i | DITEM_RESTORE;
+    return ((dmenuOpenSimple(&MenuMedia, FALSE) && mediaDevice) ? DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE;
 }
 
 /* Return TRUE if all the media variables are set up correctly */
 Boolean
 mediaVerify(void)
 {
-    if (!mediaDevice) {
-	msgConfirm("Media type not set!  Please select a media type\n"
-		   "from the Installation menu before proceeding.");
-	return DITEM_STATUS(mediaGetType(NULL)) == DITEM_SUCCESS;
-    }
+    if (!mediaDevice)
+	return (DITEM_STATUS(mediaGetType(NULL)) == DITEM_SUCCESS);
     return TRUE;
 }