--- elwix/config/etc/default/rc 2017/10/08 00:05:37 1.3.2.5 +++ elwix/config/etc/default/rc 2018/07/03 22:03:59 1.3.2.8 @@ -2,7 +2,7 @@ # # Boot startup script for ELWIX BaseFS ... # -# $Id: rc,v 1.3.2.5 2017/10/08 00:05:37 misho Exp $ +# $Id: rc,v 1.3.2.8 2018/07/03 22:03:59 misho Exp $ stty status '^T' @@ -22,10 +22,11 @@ ETCDEV="md1" ETCSIZE="8m" FRMDEV2="md4" -FRMSIZE2="21m" +FRMSIZE2="24m" FRMFILE2="elwix-firmware2.sys" FRMPATH="/elwix" +FRM2PATH="/elwix/pkg" FIT2CF="/dev/ufs/fit2cf" CFDIR="/elwix/cf" @@ -45,17 +46,17 @@ boot_elwix2() { echo " BaseFS: Loading ELWIX secondary firmware" - mdmfs -s $FRMSIZE2 -S -n -m0 -oasync $FRMDEV2 /elwix/pkg + mdmfs -s $FRMSIZE2 -S -n -m0 -oasync $FRMDEV2 $FRM2PATH if test $? -ne 0; then failed_sysvol "to mount firmware image " $FRMFILE2 fi - cd /elwix/pkg + cd $FRM2PATH pax -r -z -pe -f $FRMPATH/$FRMFILE2 if test $? -ne 0; then failed_sysvol "to load firmware image " $FRMFILE2 fi cd - - mount -ur /elwix/pkg || failed_sysvol mount "secondary firmware" + mount -ur $FRM2PATH } # @@ -71,13 +72,13 @@ if test -c $ELWIX2; then fi fi -if ! mount -o ro $ELWIX $FRMPATH; then - umount $FRMPATH +if ! mount -o ro $ELWIX /; then + umount / fsck -y $ELWIX 1>/dev/null 2>&1 - if ! mount -o ro $ELWIX $FRMPATH; then - umount -f $FRMPATH + if ! mount -o ro $ELWIX /; then + umount -f / fsck -f -y $ELWIX 1>/dev/null 2>&1 - if ! mount -o ro $ELWIX $FRMPATH; then + if ! mount -o ro $ELWIX /; then failed_sysvol mount "system volume" fi fi @@ -109,5 +110,8 @@ fi if test -r "$FRMPATH/$FRMFILE2"; then boot_elwix2 fi + +mkdir /var/etc +mount -tunionfs /var/etc /etc exec /etc/rc.init