--- elwix/config/etc/default/rc	2016/12/15 14:32:50	1.2.8.1
+++ elwix/config/etc/default/rc	2017/06/15 23:18:37	1.3.2.2
@@ -2,7 +2,7 @@
 #
 # Boot startup script for ELWIX BaseFS ...
 #
-# $Id: rc,v 1.2.8.1 2016/12/15 14:32:50 misho Exp $
+# $Id: rc,v 1.3.2.2 2017/06/15 23:18:37 misho Exp $
 
 stty status '^T'
 
@@ -18,7 +18,7 @@ EDITOR=vi
 PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER
 
-FRMDEV2="md2"
+FRMDEV2="md3"
 FRMSIZE2="21m"
 FRMFILE2="elwix-firmware2.sys"
 
@@ -39,17 +39,17 @@ boot_elwix2()
 {
 	echo " BaseFS: Loading ELWIX secondary firmware"
 
-	mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /usr/local
+	mdmfs -s $FRMSIZE2 -S -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,10 +58,17 @@ boot_elwix2()
 
 echo "ELWIX>>> Firmware BaseFS boot stage ..."
 
-mount -a || \
-	umount -A && fsck -y 1>/dev/null 2>&1 && mount -a || \
-	umount -Af && fsck -f -y 1>/dev/null 2>&1 && mount -a || \
-	failed_sysvol mount "system volume"
+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 " BaseFS: Mount ELWIX flash volume"