Diff for /elwix/config/etc/rootfs/rc between versions 1.3.2.1 and 1.7.2.1

version 1.3.2.1, 2013/01/28 10:48:46 version 1.7.2.1, 2017/06/15 23:18:37
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
   
FRMDEV="md1"FRMDEV="md2"
FRMSIZE="41m"FRMSIZE="42m"
 FRMFILE="elwix-firmware.sys"  FRMFILE="elwix-firmware.sys"
   
FRMDEV2="md2"FRMDEV2="md3"
 FRMSIZE2="21m"  FRMSIZE2="21m"
 FRMFILE2="elwix-firmware2.sys"  FRMFILE2="elwix-firmware2.sys"
   
Line 60  boot_elwix2() Line 60  boot_elwix2()
 {  {
         echo " RootFS: Loading ELWIX secondary firmware"          echo " RootFS: Loading ELWIX secondary firmware"
   
        mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /usr/local        mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /elwix/pkg
         if [ "$?" != "0" ]; then          if [ "$?" != "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 [ "$?" != "0" ]; then          if [ "$?" != "0" ]; then
                 failed_sysvol "to load firmware image " $FRMFILE2                  failed_sysvol "to load firmware image " $FRMFILE2
         fi          fi
         cd -          cd -
        mount -ur /usr/local        mount -ur /elwix/pkg
 }  }
   
 mount_usr()  mount_usr()
Line 88  mount_usr() Line 88  mount_usr()
 #  #
   
 echo "ELWIX>>> Firmware RootFS boot stage ..."  echo "ELWIX>>> Firmware RootFS boot stage ..."
echo " RootFS: Mount ELWIX system volume"
fsck -y 1>/dev/null 2>&1 && mount -a || fsck -y 1>/dev/null 2>&1 && mount -a || \if ! mount -a; then
        fsck -f -y 1>/dev/null 2>&1 && mount -a || failed_sysvol mount "system volume"        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  if test -c "$FIT2CF" -a -d "$CFDIR"; then
         echo " RootFS: Mount ELWIX flash volume"          echo " RootFS: Mount ELWIX flash volume"

Removed from v.1.3.2.1  
changed lines
  Added in v.1.7.2.1


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