--- elwix/config/etc/default/rc	2017/06/15 23:18:37	1.3.2.2
+++ elwix/config/etc/default/rc	2017/06/28 11:59:10	1.3.2.4
@@ -2,7 +2,7 @@
 #
 # Boot startup script for ELWIX BaseFS ...
 #
-# $Id: rc,v 1.3.2.2 2017/06/15 23:18:37 misho Exp $
+# $Id: rc,v 1.3.2.4 2017/06/28 11:59:10 misho Exp $
 
 stty status '^T'
 
@@ -18,7 +18,10 @@ EDITOR=vi
 PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER
 
-FRMDEV2="md3"
+ETCDEV="md1"
+ETCSIZE="8m"
+
+FRMDEV2="md4"
 FRMSIZE2="21m"
 FRMFILE2="elwix-firmware2.sys"
 
@@ -26,6 +29,8 @@ FRMPATH="/elwix"
 FIT2CF="/dev/ufs/fit2cf"
 CFDIR="/elwix/cf"
 
+ELWIX2="/dev/ufs/elwix2"
+
 umask 022
 
 failed_sysvol()
@@ -39,7 +44,7 @@ boot_elwix2()
 {
 	echo " BaseFS: Loading ELWIX secondary firmware"
 
-	mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /elwix/pkg
+	mdmfs -s $FRMSIZE2 -S -n -m0 -oasync $FRMDEV2 /elwix/pkg
 	if test $? -ne 0; then
 		failed_sysvol "to mount firmware image " $FRMFILE2
 	fi
@@ -58,6 +63,17 @@ boot_elwix2()
 
 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 /
+	fi
+else
+	mount /
+fi
+
 if ! mount -a; then
 	umount -A
 	fsck -y 1>/dev/null 2>&1
@@ -72,7 +88,7 @@ fi
 
 if test -c "$FIT2CF" -a -d "$CFDIR"; then
 	echo " BaseFS: Mount ELWIX flash volume"
-	mount -o ro $FIT2CF || \
+	mount -o ro $FIT2CF $CFDIR || \
 		fsck -y -tufs $FIT2CF 1>/dev/null 2>&1 && mount -o ro $FIT2CF $CFDIR || \
 		failed_sysvol mount "flash volume"
 fi