--- elwix/config/etc/default/rc	2016/12/15 16:48:19	1.2.8.2
+++ 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.2.8.2 2016/12/15 16:48:19 misho Exp $
+# $Id: rc,v 1.3.2.5 2017/10/08 00:05:37 misho Exp $
 
 stty status '^T'
 
@@ -18,7 +18,10 @@ EDITOR=vi
 PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER
 
-FRMDEV2="md2"
+ETCDEV="md1"
+ETCSIZE="8m"
+
+FRMDEV2="md4"
 FRMSIZE2="21m"
 FRMFILE2="elwix-firmware2.sys"
 
@@ -26,6 +29,9 @@ FRMPATH="/elwix"
 FIT2CF="/dev/ufs/fit2cf"
 CFDIR="/elwix/cf"
 
+ELWIX2="/dev/ufs/elwix2"
+ELWIX="/dev/ufs/elwix"
+
 umask 022
 
 failed_sysvol()
@@ -39,17 +45,17 @@ boot_elwix2()
 {
 	echo " BaseFS: Loading ELWIX secondary firmware"
 
-	mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /usr/local
+	mdmfs -s $FRMSIZE2 -S -n -m0 -oasync $FRMDEV2 /elwix/pkg
 	if test $? -ne 0; then
 		failed_sysvol "to mount firmware image " $FRMFILE2
 	fi
-	cd /usr/local
+	cd /elwix/pkg
 	pax -r -z -pe -f $FRMPATH/$FRMFILE2
 	if test $? -ne 0; then
 		failed_sysvol "to load firmware image " $FRMFILE2
 	fi
 	cd -
-	mount -ur /usr/local || failed_sysvol mount "secondary firmware"
+	mount -ur /elwix/pkg || failed_sysvol mount "secondary firmware"
 }
 
 #
@@ -58,6 +64,25 @@ boot_elwix2()
 
 echo "ELWIX>>> Firmware BaseFS 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
@@ -71,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 || \
-		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