--- elwix/config/etc/default/rc	2017/06/28 11:59:10	1.3.2.4
+++ elwix/config/etc/default/rc	2017/10/08 00:05:37	1.3.2.5
@@ -2,7 +2,7 @@
 #
 # Boot startup script for ELWIX BaseFS ...
 #
-# $Id: rc,v 1.3.2.4 2017/06/28 11:59:10 misho Exp $
+# $Id: rc,v 1.3.2.5 2017/10/08 00:05:37 misho Exp $
 
 stty status '^T'
 
@@ -30,6 +30,7 @@ FIT2CF="/dev/ufs/fit2cf"
 CFDIR="/elwix/cf"
 
 ELWIX2="/dev/ufs/elwix2"
+ELWIX="/dev/ufs/elwix"
 
 umask 022
 
@@ -66,14 +67,22 @@ echo "ELWIX>>> Firmware BaseFS boot stage ..."
 if test -c $ELWIX2; then
 	BOOTSLICE=`kenv currdev`
 	if test "${BOOTSLICE#disk0}" != "a:"; then
-		mount -o ro $ELWIX2 /
-	else
-		mount /
+		ELWIX=$ELWIX2
 	fi
-else
-	mount /
 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
@@ -87,10 +96,14 @@ if ! mount -a; then
 fi
 
 if test -c "$FIT2CF" -a -d "$CFDIR"; then
-	echo " BaseFS: Mount ELWIX flash volume"
-	mount -o ro $FIT2CF $CFDIR || \
-		fsck -y -tufs $FIT2CF 1>/dev/null 2>&1 && mount -o ro $FIT2CF $CFDIR || \
-		failed_sysvol mount "flash volume"
+	echo " RootFS: Mount ELWIX 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 test -r "$FRMPATH/$FRMFILE2"; then