Diff for /elwix/config/etc/default/rc between versions 1.2.8.1 and 1.3.2.3

version 1.2.8.1, 2016/12/15 14:32:50 version 1.3.2.3, 2017/06/19 20:26:48
Line 18  EDITOR=vi Line 18  EDITOR=vi
 PAGER=less  PAGER=less
 export HOME PATH TERM BLOCKSIZE EDITOR PAGER  export HOME PATH TERM BLOCKSIZE EDITOR PAGER
   
FRMDEV2="md2"FRMDEV2="md4"
 FRMSIZE2="21m"  FRMSIZE2="21m"
 FRMFILE2="elwix-firmware2.sys"  FRMFILE2="elwix-firmware2.sys"
   
Line 39  boot_elwix2() Line 39  boot_elwix2()
 {  {
         echo " BaseFS: Loading ELWIX secondary firmware"          echo " BaseFS: Loading ELWIX secondary firmware"
   
        mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /usr/local        mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /elwix/pkg
         if test $? -ne 0; then          if test $? -ne 0; then
                 failed_sysvol "to mount firmware image " $FRMFILE2                  failed_sysvol "to mount firmware image " $FRMFILE2
         fi          fi
        cd /usr/local        cd /elwix/pkg
         pax -r -z -pe -f $FRMPATH/$FRMFILE2          pax -r -z -pe -f $FRMPATH/$FRMFILE2
         if test $? -ne 0; then          if test $? -ne 0; then
                 failed_sysvol "to load firmware image " $FRMFILE2                  failed_sysvol "to load firmware image " $FRMFILE2
         fi          fi
         cd -          cd -
        mount -ur /usr/local || failed_sysvol mount "secondary firmware"        mount -ur /elwix/pkg || failed_sysvol mount "secondary firmware"
 }  }
   
 #  #
Line 58  boot_elwix2() Line 58  boot_elwix2()
   
 echo "ELWIX>>> Firmware BaseFS boot stage ..."  echo "ELWIX>>> Firmware BaseFS boot stage ..."
   
mount -a || \if ! mount -a; then
        umount -A && fsck -y 1>/dev/null 2>&1 && mount -a || \        umount -A
        umount -Af && fsck -f -y 1>/dev/null 2>&1 && mount -a || \        fsck -y 1>/dev/null 2>&1
        failed_sysvol mount "system volume"        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  if test -c "$FIT2CF" -a -d "$CFDIR"; then
         echo " BaseFS: Mount ELWIX flash volume"          echo " BaseFS: Mount ELWIX flash volume"

Removed from v.1.2.8.1  
changed lines
  Added in v.1.3.2.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>