Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/distrib/x68k/floppies/ramdisk.sysinst Pull up revision ...



details:   https://anonhg.NetBSD.org/src/rev/0c444f067804
branches:  netbsd-1-5
changeset: 490400:0c444f067804
user:      he <he%NetBSD.org@localhost>
date:      Fri Dec 15 05:32:42 2000 +0000

description:
Pull up revision 1.7 (requested by minoura):
  Reorganize installation system by removing the old script based
  installer, provided for 4M systems.  Instead we provide
  ``floppy-root'' 2-floppy installer.

diffstat:

 distrib/x68k/floppies/ramdisk.sysinst/dot.profile |  19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r a5be06e28ded -r 0c444f067804 distrib/x68k/floppies/ramdisk.sysinst/dot.profile
--- a/distrib/x68k/floppies/ramdisk.sysinst/dot.profile Fri Dec 15 05:32:19 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk.sysinst/dot.profile Fri Dec 15 05:32:42 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.5.2.1 2000/08/31 15:30:46 minoura Exp $
+# $NetBSD: dot.profile,v 1.5.2.2 2000/12/15 05:32:42 he Exp $
 #
 # Copyright (c) 1997 Perry E. Metzger
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -46,7 +46,7 @@
 
 umask 022
 
-ROOTDEV=/dev/md0a
+ROOTDEVS="/dev/md0a /dev/fd0c /dev/fd1c /dev/fd2c /Dummy"
 
 if [ "X${DONEPROFILE}" = "X" ]; then
        DONEPROFILE=YES
@@ -57,13 +57,20 @@
        stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
        echo ''
 
-       # mount the ramdisk read write
-       mount -u $ROOTDEV /
+       # mount the miniroot read write
+       # our miniroot can be either on ramdisk or on floppy.
+       for $ROOTDEV in $ROOTDEVS; do
+               ( mount -u $ROOTDEV / > /dev/null 2>&1 ) && break
+       done
 
        # pull in the functions that people will use from the shell prompt.
        # . /.commonutils
        # . /.instutils
 
-       # run sysinst.
-       sysinst
+       if [ "$ROOTDEV" = "/Dummy" ]; then
+               echo "Could not determine root device."
+       else
+               # run sysinst.
+               sysinst
+       fi
 fi



Home | Main Index | Thread Index | Old Index