[src/netbsd-1-4]: src/distrib/miniroot pullup 1.28->1.29 (mrg)

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

details:   https://anonhg.NetBSD.org/src/rev/836ea17d45b9
branches:  netbsd-1-4
changeset: 469134:836ea17d45b9
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Jul 01 19:25:31 1999 +0000

description:
pullup 1.28->1.29 (mrg)

diffstat:

 distrib/miniroot/install.sub |  87 ++++++++++++++++++++++++++-----------------
 1 files changed, 53 insertions(+), 34 deletions(-)

diffs (169 lines):

diff -r c54aad357f6f -r 836ea17d45b9 distrib/miniroot/install.sub
--- a/distrib/miniroot/install.sub      Thu Jul 01 19:23:10 1999 +0000
+++ b/distrib/miniroot/install.sub      Thu Jul 01 19:25:31 1999 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: install.sub,v 1.25.2.2 1999/06/18 16:19:10 perry Exp $
+#      $NetBSD: install.sub,v 1.25.2.3 1999/07/01 19:25:31 perry Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -374,6 +374,7 @@
        local _interface_mediumtype
        local _interface_supported_media
        local _m
+       local _t
 
        _interface_name=$1
        _up=DOWN
@@ -382,21 +383,28 @@
        fi
 
        _interface_supported_media=`ifconfig -m $_interface_name | sed -n '
-               3s/supported media: //p'`
+               /^[     ]*media autoselect/d
+               4,$s/[  ]*media //p'`
+
+       # get current "media" "ip" and "netmask" ("broadcast")
+       _t=`ifconfig $_interface_name | sed -n '
+               s/^[    ]*media: [^     ]* \([^ ][^ ]*\).*/\1/p'`
+
+       if [ "$_t" != "manual" -a "$_t" != "media:" -a "$_t" != "autoselect" ];
+       then
+               _interface_mediumtype=$1
+       fi
 
        set -- `ifconfig $_interface_name | sed -n '
-               2s/media: \([^ ][^ ]*\).*/\1/p
-               3s/inet//
-               3s/--> [0-9.][0-9.]*//
-               3s/netmask//
-               3s/broadcast//
-               3p'`
+               /^[     ]*inet/{
+               s/inet//
+               s/--> [0-9.][0-9.]*//
+               s/netmask//
+               s/broadcast//
+               p;}'`
 
-       if [ "$1" != "manual" ]; then
-               _interface_mediumtype=$1
-       fi
-       _interface_ip=$2
-       _interface_mask=$3
+       _interface_ip=$1
+       _interface_mask=$2
 
        # Get IP address
        resp=""         # force one iteration
@@ -424,11 +432,11 @@
 
        echo "Your network interface might require explicit selection"
        echo "of the type of network medium attached. Supported media:"
-       echo " $_interface_supported_media."
-       echo -n "Additional media type arguments? [$_interface_mediumtype] "
+       echo "$_interface_supported_media"
+       echo -n "Additional media type arguments (none)? [$_interface_mediumtype] "
        getresp "$_interface_mediumtype"
        _m=""
-       if [ "X${resp}" != X"" ]; then
+       if [ "X${resp}" != X"" -a "X${resp}" != Xnone ]; then
                _interface_mediumtype=$resp
                _m="media ${resp}"
        fi
@@ -438,9 +446,9 @@
        echo "directives (like \`link0'). If this is the case you can enter"
        echo "these at the next prompt."
        echo ""
-       echo -n "Additional link-layer arguments? [$_interface_extra] "
+       echo -n "Additional link-layer arguments (none)? [$_interface_extra] "
        getresp "$_interface_extra"
-       if [ "X${resp}" != X"" ]; then
+       if [ "X${resp}" != X"" -a "X${resp}" != Xnone ]; then
                _interface_extra=$resp
        fi
 
@@ -749,6 +757,7 @@
        local _filename
        local _sets
        local _next
+       local _all
        local _f
        local _dirname
 
@@ -803,13 +812,17 @@
                echo ""
 
                _next=""
+               _all=""
                for _f in $_sets ; do
                        if isin $_f $_setsdone; then
                                echo -n "[X] "
                                _next=""
                        else
                                echo -n "    "
-                               if [ -z "$_next" ]; then _next=$_f; fi
+                               if [ -z "$_next" ]; then
+                                       _next=$_f;
+                               fi
+                               _all="$_all $_f"
                        fi
                        echo $_f
                done
@@ -823,26 +836,32 @@
                        break
                fi
 
-               echo -n "File name [$_next]? "
+               echo -n "File name(s) (or "all") [$_next]? "
                getresp "$_next"
-               _f=$resp
-               _filename="/${_dirname}/$_f"
+               if [ "x$resp" = xall ]; then
+                       resp="$_all"
+               fi
 
-               # Ensure file exists
-               if [ ! -f $_filename ]; then
-                       if [ -f ${_filename}.aa ]; then
-                               _filename=${_filename}.\?\?
-                       else
+               for _f in $resp; do
+                       _filename="/${_dirname}/$_f"
+
+                       # Ensure file exists
+                       if [ ! -f $_filename ]; then
+                               if [ -f ${_filename}.aa ]; then
+                                       _filename=${_filename}.\?\?
+                               else
                         echo "File $_filename does not exist.  Check to make"
                         echo "sure you entered the information properly."
-                        continue
+                        continue 2
+                               fi
                        fi
-               fi
 
-               # Extract file
-               cat $_filename | (cd /mnt; pax -zrvpe)
-               echo "Extraction complete."
-               _setsdone="$_f $_setsdone"
+                       # Extract file
+                       echo "Extracting the $_f set:"
+                       cat $_filename | (cd /mnt; pax -zrvpe)
+                       echo "Extraction complete."
+                       _setsdone="$_f $_setsdone"
+               done
 
        done
 }
@@ -1389,7 +1408,7 @@
                # Mount the filesystem.  If the mount fails, exit
                # with an error condition to tell the outer
                # later to bail.
-               if ! mount -v -t $_fstype -o $_opt $_dev $_mp ; then
+               if ! mount -v -t $_fstype -o async -o $_opt $_dev $_mp ; then
                        # error message displated by mount
                        exit 1
                fi