--- elwix/config/etc/rootfs/rc	2017/06/19 20:26:48	1.7.2.2
+++ elwix/config/etc/rootfs/rc	2017/10/08 01:38:48	1.7.2.5
@@ -2,7 +2,7 @@
 #
 # Boot startup script for ELWIX RootFS ...
 #
-# $Id: rc,v 1.7.2.2 2017/06/19 20:26:48 misho Exp $
+# $Id: rc,v 1.7.2.5 2017/10/08 01:38:48 misho Exp $
 
 stty status '^T'
 
@@ -30,9 +30,13 @@ FRMSIZE2="21m"
 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()
@@ -63,17 +67,17 @@ boot_elwix2()
 {
 	echo " RootFS: Loading ELWIX secondary firmware"
 
-	mdmfs -s $FRMSIZE2 -S -n -m0 -oasync $FRMDEV2 /elwix/pkg
+	mdmfs -s $FRMSIZE2 -S -n -m0 -oasync $FRMDEV2 $FRM2PATH
 	if [ "$?" != "0" ]; then
 		failed_sysvol "to mount firmware image " $FRMFILE2
 	fi
-	cd /elwix/pkg
+	cd $FRM2PATH
 	pax -r -z -pe -f $FRMPATH/$FRMFILE2
 	if [ "$?" != "0" ]; then
 		failed_sysvol "to load firmware image " $FRMFILE2
 	fi
 	cd -
-	mount -ur /elwix/pkg
+	mount -ur $FRM2PATH
 }
 
 mount_usr()
@@ -92,6 +96,25 @@ mount_usr()
 
 echo "ELWIX>>> Firmware RootFS boot stage ..."
 
+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
@@ -106,8 +129,13 @@ 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/$FRMFILE ]; then