--- elwix/config/etc/default/rc	2013/07/29 14:06:32	1.1.2.1
+++ elwix/config/etc/default/rc	2018/07/06 08:30:29	1.3.2.10
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# Boot startup script for ELWIX RootFS ...
+# Boot startup script for ELWIX BaseFS ...
 #
-# $Id: rc,v 1.1.2.1 2013/07/29 14:06:32 misho Exp $
+# $Id: rc,v 1.3.2.10 2018/07/06 08:30:29 misho Exp $
 
 stty status '^T'
 
@@ -18,57 +18,81 @@ EDITOR=vi
 PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER
 
-FRMDEV2="md2"
-FRMSIZE2="21m"
+ETCDEV="md1"
+ETCSIZE="8m"
+
+FRMDEV2="md4"
+FRMSIZE2="24m"
 FRMFILE2="elwix-firmware2.sys"
 
 FRMPATH="/elwix"
+FRM2PATH="/elwix/pkg"
 FIT2CF="/dev/ufs/fit2cf"
 CFDIR="/elwix/cf"
 
+ELWIX2="/dev/ufs/elwix2"
+ELWIX="/dev/ufs/elwix"
+
 umask 022
 
 failed_sysvol()
 {
-	echo " RootFS: Failed $1 - $2 ... Go to emergency shell !!!"
+	echo " BaseFS: Failed $1 - $2 ... Go to emergency shell !!!"
 
 	exit 127
 }
 
 boot_elwix2()
 {
-	echo " RootFS: Loading ELWIX secondary firmware"
+	echo " BaseFS: Loading ELWIX secondary firmware"
 
-	mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /usr/local
-	if [ "$?" != "0" ]; then
+	mdmfs -s $FRMSIZE2 -S -n -m0 -oasync $FRMDEV2 $FRM2PATH
+	if test $? -ne 0; then
 		failed_sysvol "to mount firmware image " $FRMFILE2
 	fi
-	cd /usr/local
+	cd $FRM2PATH
 	pax -r -z -pe -f $FRMPATH/$FRMFILE2
-	if [ "$?" != "0" ]; then
+	if test $? -ne 0; then
 		failed_sysvol "to load firmware image " $FRMFILE2
 	fi
 	cd -
-	mount -ur /usr/local
+	mount -ur $FRM2PATH
 }
 
 #
 ## main()
 #
 
-echo "ELWIX>>> Firmware RootFS boot stage ..."
-echo " RootFS: Mount ELWIX system volume"
-fsck -y 1>/dev/null 2>&1 && mount -a || fsck -y 1>/dev/null 2>&1 && mount -a || \
-	fsck -f -y 1>/dev/null 2>&1 && mount -a || failed_sysvol mount "system volume"
+echo "ELWIX>>> Firmware BaseFS boot stage ..."
 
+if ! mount -a; then
+	umount -A
+	fsck -y 1>/dev/null 2>&1
+	if ! mount -a; then
+		umount -A -f
+		fsck -f -y 1>/dev/null 2>&1
+		if ! mount -a; then
+			failed_sysvol mount "system volumes"
+		fi
+	fi
+fi
+
 if test -c "$FIT2CF" -a -d "$CFDIR"; then
 	echo " RootFS: Mount ELWIX flash volume"
-	fsck -y -tufs $FIT2CF 1>/dev/null 2>&1 && mount -o ro $FIT2CF $CFDIR || \
-		failed_sysvol mount "flash volume"
+	if ! mount -o ro $FIT2CF $CFDIR; then
+		umount $CFDIR
+		fsck -y -tufs $FIT2CF 1>/dev/null 2>&1
+		if ! mount -o ro $FIT2CF $CFDIR; then
+			echo "Error:: mount of $FIT2CF to $CFDIR failed!"
+		fi
+	fi
 fi
 
-if [ -r $FRMPATH/$FRMFILE2 ]; then
+if test -r "$FRMPATH/$FRMFILE2"; then
 	boot_elwix2
 fi
+
+mkdir /var/etc
+mount -tunionfs /var/etc /etc
 
 exec /etc/rc.init