[src/trunk]: src/distrib/utils/sysinst address the problems described in PR#7...

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/133ebc4813e2
branches:  trunk
changeset: 473938:133ebc4813e2
user:      cgd <cgd%NetBSD.org@localhost>
date:      Tue Jun 22 18:47:07 1999 +0000

description:
address the problems described in PR#7833 and its followups: ftp/nfs
installation would try to continue even if no networking interfaces found,
and, and, when that was fixed, instead of dropping back to the
pick-distribution-medium menu they'd drop all the way back to the opening
menu.

diffstat:

 distrib/utils/sysinst/net.c  |  14 ++++++++++----
 distrib/utils/sysinst/util.c |   7 +++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diffs (71 lines):

diff -r fd61ccc3236e -r 133ebc4813e2 distrib/utils/sysinst/net.c
--- a/distrib/utils/sysinst/net.c       Tue Jun 22 18:17:24 1999 +0000
+++ b/distrib/utils/sysinst/net.c       Tue Jun 22 18:47:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.49 1999/06/22 00:57:06 cgd Exp $     */
+/*     $NetBSD: net.c,v 1.50 1999/06/22 18:47:07 cgd Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -266,7 +266,6 @@
        if (network_up)
                return (1);
 
-       network_up = 1;
        net_devices[0] = '\0';
        get_ifconfig_info();
        if (strlen(net_devices) == 0) {
@@ -275,6 +274,8 @@
                process_menu(MENU_ok);
                return (-1);
        }
+       network_up = 1;
+
        strncpy(defname, net_devices, 255);
        tp = defname;
        strsep(&tp, " ");
@@ -436,7 +437,9 @@
        char filename[SSTRSIZE];
        int  ret;
 
-       while (!config_network()) {
+       while ((ret = config_network()) <= 0) {
+               if (ret < 0)
+                       return (-1);
                msg_display(MSG_netnotup);
                process_menu(MENU_yesno);
                if (!yesno)
@@ -518,8 +521,11 @@
 int
 get_via_nfs()
 {
+       int ret;
 
-        while (!config_network()) {
+        while ((ret = config_network()) <= 0) {
+               if (ret < 0)
+                       return (-1);
                 msg_display(MSG_netnotup);
                 process_menu(MENU_yesno);
                 if (!yesno)
diff -r fd61ccc3236e -r 133ebc4813e2 distrib/utils/sysinst/util.c
--- a/distrib/utils/sysinst/util.c      Tue Jun 22 18:17:24 1999 +0000
+++ b/distrib/utils/sysinst/util.c      Tue Jun 22 18:47:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.45 1999/06/22 06:57:01 cgd Exp $    */
+/*     $NetBSD: util.c,v 1.46 1999/06/22 18:47:07 cgd Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -736,7 +736,10 @@
        ask_verbose_dist();
 
        /* Get the distribution files */
-       process_menu(MENU_distmedium);
+       do {
+               got_dist = 0;
+               process_menu(MENU_distmedium);
+       } while (got_dist == -1);
 
        if (nodist)
                return 1;