--- elwix/config/etc/rootfs/rc	2012/10/11 14:20:01	1.1.1.1.6.13
+++ elwix/config/etc/rootfs/rc	2017/06/15 23:18:37	1.7.2.1
@@ -2,7 +2,7 @@
 #
 # Boot startup script for ELWIX RootFS ...
 #
-# $Id: rc,v 1.1.1.1.6.13 2012/10/11 14:20:01 misho Exp $
+# $Id: rc,v 1.7.2.1 2017/06/15 23:18:37 misho Exp $
 
 stty status '^T'
 
@@ -18,12 +18,12 @@ EDITOR=vi
 PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER
 
-FRMDEV="md1"
-FRMSIZE="41m"
+FRMDEV="md2"
+FRMSIZE="42m"
 FRMFILE="elwix-firmware.sys"
 
-FRMDEV2="md2"
-FRMSIZE2="42m"
+FRMDEV2="md3"
+FRMSIZE2="21m"
 FRMFILE2="elwix-firmware2.sys"
 
 FRMPATH="/elwix"
@@ -60,17 +60,17 @@ boot_elwix2()
 {
 	echo " RootFS: Loading ELWIX secondary firmware"
 
-	mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /usr/local
+	mdmfs -s $FRMSIZE2 -S -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,14 +88,22 @@ 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 ! 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"
 fi