--- elwix/config/etc/rootfs/rc	2013/01/28 01:47:36	1.3
+++ elwix/config/etc/rootfs/rc	2017/10/08 00:05:37	1.7.2.4
@@ -2,7 +2,7 @@
 #
 # Boot startup script for ELWIX RootFS ...
 #
-# $Id: rc,v 1.3 2013/01/28 01:47:36 misho Exp $
+# $Id: rc,v 1.7.2.4 2017/10/08 00:05:37 misho Exp $
 
 stty status '^T'
 
@@ -18,11 +18,14 @@ EDITOR=vi
 PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER
 
-FRMDEV="md1"
-FRMSIZE="41m"
+ETCDEV="md1"
+ETCSIZE="8m"
+
+FRMDEV="md3"
+FRMSIZE="42m"
 FRMFILE="elwix-firmware.sys"
 
-FRMDEV2="md2"
+FRMDEV2="md4"
 FRMSIZE2="21m"
 FRMFILE2="elwix-firmware2.sys"
 
@@ -30,6 +33,9 @@ FRMPATH="/elwix"
 FIT2CF="/dev/ufs/fit2cf"
 CFDIR="/elwix/cf"
 
+ELWIX2="/dev/ufs/elwix2"
+ELWIX="/dev/ufs/elwix"
+
 umask 022
 
 failed_sysvol()
@@ -43,7 +49,7 @@ boot_elwix()
 {
 	echo " RootFS: Loading ELWIX system firmware"
 
-	mdmfs -s $FRMSIZE -S -m0 -oasync $FRMDEV /usr
+	mdmfs -s $FRMSIZE -S -n -m0 -oasync $FRMDEV /usr
 	if [ "$?" != "0" ]; then
 		failed_sysvol "to mount firmware image " $FRMFILE
 	fi
@@ -60,17 +66,17 @@ boot_elwix2()
 {
 	echo " RootFS: Loading ELWIX secondary firmware"
 
-	mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /usr/local
+	mdmfs -s $FRMSIZE2 -S -n -m0 -oasync $FRMDEV2 /elwix/pkg
 	if [ "$?" != "0" ]; then
 		failed_sysvol "to mount firmware image " $FRMFILE2
 	fi
-	cd /usr/local
+	cd /elwix/pkg
 	pax -r -z -pe -f $FRMPATH/$FRMFILE2
 	if [ "$?" != "0" ]; then
 		failed_sysvol "to load firmware image " $FRMFILE2
 	fi
 	cd -
-	mount -ur /usr/local
+	mount -ur /elwix/pkg
 }
 
 mount_usr()
@@ -88,15 +94,47 @@ mount_usr()
 #
 
 echo "ELWIX>>> Firmware RootFS boot stage ..."
-echo " RootFS: Mount ELWIX system volume"
-fsck -q -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"
 
-if test -c $FIT2CF -a -d $CFDIR; then
+if test -c $ELWIX2; then
+	BOOTSLICE=`kenv currdev`
+	if test "${BOOTSLICE#disk0}" != "a:"; then
+		ELWIX=$ELWIX2
+	fi
+fi
+
+if ! mount -o ro $ELWIX $FRMPATH; then
+	umount $FRMPATH
+	fsck -y $ELWIX 1>/dev/null 2>&1
+	if ! mount -o ro $ELWIX $FRMPATH; then
+		umount -f $FRMPATH
+		fsck -f -y $ELWIX 1>/dev/null 2>&1
+		if ! mount -o ro $ELWIX $FRMPATH; then
+			failed_sysvol mount "system volume"
+		fi
+	fi
+fi
+
+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 volume"
+		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 || \
-		fsck -f -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/$FRMFILE ]; then
@@ -112,5 +150,9 @@ fi
 if [ -r $FRMPATH/$FRMFILE2 ]; then
 	boot_elwix2
 fi
+
+cd /elwix
+mdmfs -s $ETCSIZE -S -n -m0 -oasync $ETCDEV /etc
+pax -rw -pe etc /
 
 exec /etc/rc.init