--- elwix/config/etc/rootfs/rc	2011/07/05 23:43:00	1.1
+++ elwix/config/etc/rootfs/rc	2012/10/12 08:22:45	1.2
@@ -2,7 +2,7 @@
 #
 # Boot startup script for ELWIX RootFS ...
 #
-# $Id: rc,v 1.1 2011/07/05 23:43:00 misho Exp $
+# $Id: rc,v 1.2 2012/10/12 08:22:45 misho Exp $
 
 stty status '^T'
 
@@ -18,27 +18,71 @@ EDITOR=vi
 PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER
 
+FRMDEV="md1"
+FRMSIZE="41m"
+FRMFILE="elwix-firmware.sys"
+
+FRMDEV2="md2"
+FRMSIZE2="42m"
+FRMFILE2="elwix-firmware2.sys"
+
+FRMPATH="/elwix"
+FIT2CF="/dev/ufs/fit2cf"
+CFDIR="/elwix/cf"
+
 umask 022
 
 failed_sysvol()
 {
-	echo " RootFS: Failed $1 ELWIX system ... Go to emergency shell !!!"
+	echo " RootFS: Failed $1 - $2 ... Go to emergency shell !!!"
 
 	exit 127
 }
 
 boot_elwix()
 {
-	echo " RootFS: Load ELWIX system firmware"
-	if ! test -r /elwix/elwix-firmware.sys; then
-		failed_sysvol "not found"
+	echo " RootFS: Loading ELWIX system firmware"
+
+	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
+}
 
-	mdconfig -a -t vnode -u 1 -f /elwix/elwix-firmware.sys;
-	mount -r /dev/md1.uzip /usr;
-	sleep 2
+boot_elwix2()
+{
+	echo " RootFS: Loading ELWIX secondary firmware"
+
+	mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /usr/local
+	if [ "$?" != "0" ]; then
+		failed_sysvol "to mount firmware image " $FRMFILE2
+	fi
+	cd /usr/local
+	pax -r -z -pe -f $FRMPATH/$FRMFILE2
+	if [ "$?" != "0" ]; then
+		failed_sysvol "to load firmware image " $FRMFILE2
+	fi
+	cd -
+	mount -ur /usr/local
 }
 
+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()
 #
@@ -46,8 +90,27 @@ boot_elwix()
 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
+	fsck -f -y 1>/dev/null 2>&1 && mount -a || failed_sysvol mount "system volume"
 
-boot_elwix
+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
 
-/etc/rc.init
+if [ -r $FRMPATH/$FRMFILE ]; then
+	boot_elwix
+else
+	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