[src/netbsd-1-5]: src/distrib/sparc/ramdisk Pullup 1.15 [pk]:

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

details:   https://anonhg.NetBSD.org/src/rev/e5d038c6bc5d
branches:  netbsd-1-5
changeset: 490284:e5d038c6bc5d
user:      tv <tv%NetBSD.org@localhost>
date:      Thu Nov 30 03:52:16 2000 +0000

description:
Pullup 1.15 [pk]:
cdrom(): Look for the `instfs.tgz' image in the $MACHINE subdirectory of
the CD-R root first.

diffstat:

 distrib/sparc/ramdisk/dot.profile |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 528f4adc3c7f -r e5d038c6bc5d distrib/sparc/ramdisk/dot.profile
--- a/distrib/sparc/ramdisk/dot.profile Thu Nov 30 03:47:10 2000 +0000
+++ b/distrib/sparc/ramdisk/dot.profile Thu Nov 30 03:52:16 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.10.2.3 2000/11/09 21:53:43 tv Exp $
+# $NetBSD: dot.profile,v 1.10.2.4 2000/11/30 03:52:16 tv Exp $
 #
 # Copyright (c) 2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -42,6 +42,7 @@
 
 umask 022
 
+MACHINE=sparc
 INSTFS_MP=/instfs
 MINIROOT_FSSIZE=10000
 
@@ -152,8 +153,13 @@
 
        mount_cd9660 -o rdonly $dev /cdrom || return 1
 
-       tf=/cdrom/installation/bootfs/instfs.tgz
-       (cd $INSTFS_MP && tar zxpf $tf) || rval=1
+       # Look for instfs.tgz in MACHINE subdirectory first
+       tf=/cdrom/$MACHINE/installation/bootfs/instfs.tgz
+       [ -f $tf ] || tf=/cdrom/installation/bootfs/instfs.tgz
+       [ -f $tf ] || { echo "instfs.tgz image not found"; rval=1; }
+
+       [ $rval = 0 ] && (cd $INSTFS_MP && tar zxpf $tf) || rval=1
+
        umount /cdrom
        return $rval
 }