--LQksG6bCIzRHxTLp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

hi,
I tried upgrading my sun3 to 1.6_BETA1 using the sun3 miniroot.
I ran into a problem with distrib/miniroot/install.sub in the way it
handle rc.conf: in the upgrade procedure, the script sources /mnt/etc/rc.conf
to get the network configuration. rc.conf sources /etc/defaults/rc.conf,
which won't work here. On my sun3 this resulted in the network not being
properly set up by upgrade.sh because auto_ifconfig is not set.

To work around this problem I think install.sub should source
/mnt/etc/defaults/rc.conf if it exists, before /mnt/etc/rc.conf.
Does anyone see a problem with this change ? I tested it on my sun3.

-- 
Manuel Bouyer <bouyer@antioche.eu.org>
--

--LQksG6bCIzRHxTLp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: install.sub
===================================================================
RCS file: /cvsroot/basesrc/distrib/miniroot/install.sub,v
retrieving revision 1.42
diff -u -r1.42 install.sub
--- install.sub	2002/05/23 02:57:08	1.42
+++ install.sub	2002/06/09 12:51:11
@@ -518,6 +518,9 @@
 if [ -f /mnt/etc/rc.conf ]; then
 (
 	# assume network interface configuration style 1.2D and up
+	if [ -f /mnt/etc/defaults/rc.conf ]; then
+		. /mnt/etc/defaults/rc.conf
+	fi
 	. /mnt/etc/rc.conf
 
 	if [ "$net_interfaces" != NO ]; then

--LQksG6bCIzRHxTLp--