--- elwix/config/etc/rootfs/rc	2012/10/09 12:21:25	1.1.1.1.6.7
+++ 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.7 2012/10/09 12:21:25 misho Exp $
+# $Id: rc,v 1.7.2.1 2017/06/15 23:18:37 misho Exp $
 
 stty status '^T'
 
@@ -18,11 +18,15 @@ EDITOR=vi
 PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER
 
-FRMDEV="md1"
-FRMSIZE="82m"
+FRMDEV="md2"
+FRMSIZE="42m"
 FRMFILE="elwix-firmware.sys"
-FRMPATH="/elwix"
 
+FRMDEV2="md3"
+FRMSIZE2="21m"
+FRMFILE2="elwix-firmware2.sys"
+
+FRMPATH="/elwix"
 FIT2CF="/dev/ufs/fit2cf"
 CFDIR="/elwix/cf"
 
@@ -30,7 +34,7 @@ umask 022
 
 failed_sysvol()
 {
-	echo " RootFS: Failed $1 ELWIX $2 ... Go to emergency shell !!!"
+	echo " RootFS: Failed $1 - $2 ... Go to emergency shell !!!"
 
 	exit 127
 }
@@ -38,43 +42,83 @@ failed_sysvol()
 boot_elwix()
 {
 	echo " RootFS: Loading ELWIX system firmware"
-	if test ! -r $FRMPATH/$FRMFILE; then
-		echo " RootFS: WARNING! Failed default firmware image!"
-		echo " RootFS:   Try to load ELWIX backup firmware ..."
 
-		FRMPATH="$FRMPATH/altroot"
-		if test ! -r $FRMPATH/$FRMFILE; then
-			failed_sysvol "load backup and default image" elwix-firmware.sys
-		fi
-	fi
-
 	mdmfs -s $FRMSIZE -S -m0 -oasync $FRMDEV /usr
+	if [ "$?" != "0" ]; then
+		failed_sysvol "to mount firmware image " $FRMFILE
+	fi
 	cd /usr
 	pax -r -z -pe -f $FRMPATH/$FRMFILE
+	if [ "$?" != "0" ]; then
+		failed_sysvol "to load firmware image " $FRMFILE
+	fi
+	cd -
+	mount -ur /usr
+}
 
-	sleep 2
+boot_elwix2()
+{
+	echo " RootFS: Loading ELWIX secondary firmware"
+
+	mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /elwix/pkg
+	if [ "$?" != "0" ]; then
+		failed_sysvol "to mount firmware image " $FRMFILE2
+	fi
+	cd /elwix/pkg
+	pax -r -z -pe -f $FRMPATH/$FRMFILE2
+	if [ "$?" != "0" ]; then
+		failed_sysvol "to load firmware image " $FRMFILE2
+	fi
+	cd -
+	mount -ur /elwix/pkg
 }
 
+mount_usr()
+{
+	echo " RootFS: Mounting ELWIX system image"
+
+	mount -t nullfs -r $FRMPATH/usr /usr
+	if [ "$?" != "0" ]; then
+		failed_sysvol "to mount system image " $FRMFILE
+	fi
+}
+
 #
 ## main()
 #
 
 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
 
-if [ -r /elwix/elwix-firmware.sys ]; then
+if [ -r $FRMPATH/$FRMFILE ]; then
 	boot_elwix
 else
-	echo " RootFS: Skip loading ELWIX system firmware ..."
+	if [ -d $FRMPATH/usr ]; then
+		mount_usr
+	else
+		echo " RootFS: Skip loading ELWIX system firmware ..."
+	fi
+fi
+
+if [ -r $FRMPATH/$FRMFILE2 ]; then
+	boot_elwix2
 fi
 
 exec /etc/rc.init