[src/netbsd-1-4]: src/distrib/sparc pullup 1.11->1.12 (mrg)

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

details:   https://anonhg.NetBSD.org/src/rev/ad05d031f585
branches:  netbsd-1-4
changeset: 469137:ad05d031f585
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Jul 01 19:27:47 1999 +0000

description:
pullup 1.11->1.12 (mrg)

diffstat:

 distrib/sparc/install.md    |  40 +++++++++++++++++++++++++++-------------
 distrib/sparc/miniroot/list |   6 ++----
 2 files changed, 29 insertions(+), 17 deletions(-)

diffs (119 lines):

diff -r bbed6f94c4b0 -r ad05d031f585 distrib/sparc/install.md
--- a/distrib/sparc/install.md  Thu Jul 01 19:26:53 1999 +0000
+++ b/distrib/sparc/install.md  Thu Jul 01 19:27:47 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.11 1997/10/09 07:25:53 jtc Exp $
+#      $NetBSD: install.md,v 1.11.4.1 1999/07/01 19:27:47 perry Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,12 +41,15 @@
 #
 
 # Machine-dependent install sets
-MDSETS="xbin xman xinc xcon"
+MDSETS="kern xbase xcomp xcontrib xfont xserver"
 
 if [ "$MODE" = upgrade ]; then
        RELOCATED_FILES_13="${RELOCATED_FILES_13} /usr/sbin/installboot /usr/mdec/installboot"
 fi
 
+# Mount /kern to get at /kern/msgbuf
+mount -t kernfs none /kern
+
 md_set_term() {
        if [ ! -z "$TERM" ]; then
                return
@@ -78,17 +81,17 @@
 
 md_get_diskdevs() {
        # return available disk devices
-       dmesg | egrep "(^sd[0-9] |^x[dy][0-9] )" | cut -d" " -f1 | sort -u
+       < /kern/msgbuf sed -n -e 's/^\(sd[0-9]\) .*/\1/p' -e 's/^\(x[dy][0-9]\) .*/\1/p' | sort -u
 }
 
 md_get_cddevs() {
        # return available CDROM devices
-       dmesg | grep "^cd[0-9] " | cut -d" " -f1 | sort -u
+       < /kern/msgbuf sed -n -e 's/^\(cd[0-9]\) .*/\1/p' | sort -u
 }
 
 md_get_ifdevs() {
        # return available network devices
-       dmesg | egrep "(^le[0-9] |^ie[0-9] )" | cut -d" " -f1 | sort -u
+       < /kern/msgbuf sed -n -e 's/^\(le[0-9]\) .*/\1/p' -e 's/^\(ie[0-9]\) .*/\1/p' | sort -u
 }
 
 md_get_partition_range() {
@@ -110,17 +113,20 @@
 md_checkfordisklabel() {
        # $1 is the disk to check
        local rval
+       local cfdl
 
-       disklabel $1 > /dev/null 2> /tmp/checkfordisklabel
-       if grep "no disk label" /tmp/checkfordisklabel; then
+       cfdl=`disklabel $1 2>&1 > /dev/null | \
+           sed -n -e '/no disk label/{s/.*/ndl/p;q;}; \
+                /disk label corrupted/{s/.*/dlc/p;q;}; \
+                $s/.*/no/p'`
+       if [ x$cfdl = xndl ]; then
                rval=1
-       elif grep "disk label corrupted" /tmp/checkfordisklabel; then
+       elif [ x$cfdl = xdlc ]; then
                rval=2
        else
                rval=0
        fi
 
-       rm -f /tmp/checkfordisklabel
        return $rval
 }
 
@@ -176,13 +182,21 @@
        echo -n "Press [Enter] to continue "
        getresp ""
        disklabel -W ${_disk}
-       disklabel -e ${_disk}
+       if [ -f /usr/bin/vi ]; then 
+               disklabel -e ${_disk}
+       else
+               disklabel -i ${_disk}
+       fi
 }
 
 md_copy_kernel() {
-       echo -n "Copying kernel..."
-       cp -p /netbsd /mnt/netbsd
-       echo "done."
+       if [ -f /mnt/netbsd.GENERIC ]; then
+               echo -n "Linking /netbsd.GENERIC to /netbsd ... "
+               ln /mnt/netbsd.GENERIC /mnt/netbsd
+               echo "done."
+       else
+               echo "WARNING: No /netbsd.GENERIC!  Please install /netbsd manually!"
+       fi
 }
 
 md_welcome_banner() {
diff -r bbed6f94c4b0 -r ad05d031f585 distrib/sparc/miniroot/list
--- a/distrib/sparc/miniroot/list       Thu Jul 01 19:26:53 1999 +0000
+++ b/distrib/sparc/miniroot/list       Thu Jul 01 19:27:47 1999 +0000
@@ -1,15 +1,13 @@
-#      $NetBSD: list,v 1.11 1999/03/25 15:51:18 leo Exp $
+#      $NetBSD: list,v 1.11.2.1 1999/07/01 19:28:35 perry Exp $
 
 # Sparc extra's
 LINK   instbin                 sbin/disklabel
-LINK   instbin                 sbin/dmesg
+LINK   instbin                 sbin/mount_kernfs
 
 SYMLINK        ../../instbin           usr/bin/basename
 SYMLINK ../../instbin          usr/bin/cksum usr/bin/sum
-SYMLINK ../../instbin          usr/bin/cut
 SYMLINK ../../instbin          usr/bin/gawk usr/bin/awk
 SYMLINK ../../instbin          usr/bin/getopt
-SYMLINK ../../instbin          usr/bin/grep usr/bin/egrep usr/bin/fgrep
 SYMLINK ../../instbin          usr/bin/netstat
 SYMLINK ../../instbin          usr/bin/rsh
 SYMLINK ../../instbin          usr/bin/tset usr/bin/reset