Diff for /elwix/config/etc/rootfs/rc between versions 1.1.1.1 and 1.1.1.1.6.5

version 1.1.1.1, 2011/07/05 23:43:00 version 1.1.1.1.6.5, 2012/02/14 13:54:08
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
   
   FIT2CF="/dev/ufs/fit2cf"
   CFDIR="/elwix/cf"
   
 umask 022  umask 022
   
 failed_sysvol()  failed_sysvol()
 {  {
        echo " RootFS: Failed $1 ELWIX system ... Go to emergency shell !!!"        echo " RootFS: Failed $1 ELWIX $2 ... Go to emergency shell !!!"
   
         exit 127          exit 127
 }  }
   
 boot_elwix()  boot_elwix()
 {  {
        echo " RootFS: Load ELWIX system firmware"        echo " RootFS: Loading ELWIX system firmware"
        if ! test -r /elwix/elwix-firmware.sys; then        mdconfig -a -t vnode -u 1 -f /elwix/elwix-firmware.sys && mount -r /dev/md1.uzip /usr
                failed_sysvol "not found"        if test $? -ne 0; then
                 echo " RootFS: Failed firmware image! Try to load ELWIX system firmware from alternative location"
                 mdconfig -d -u 1 >/dev/null 2>&1
                 mdconfig -a -t vnode -u 1 -f /elwix/altroot/elwix-firmware.sys && mount -r /dev/md1.uzip /usr
                 if test $? -ne 0; then
                         mdconfig -d -u 1 >/dev/null 2>&1
                         failed_sysvol "load system and default image" elwix-firmware.sys
                 fi
         fi          fi
   
         mdconfig -a -t vnode -u 1 -f /elwix/elwix-firmware.sys;  
         mount -r /dev/md1.uzip /usr;  
         sleep 2          sleep 2
 }  }
   
Line 46  boot_elwix() Line 53  boot_elwix()
 echo "ELWIX>>> Firmware RootFS boot stage ..."  echo "ELWIX>>> Firmware RootFS boot stage ..."
 echo " RootFS: Mount ELWIX system volume"  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 -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_elwixif 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.initif [ -r /elwix/elwix-firmware.sys ]; then
         boot_elwix
 else
         echo " RootFS: Skip loading ELWIX system firmware ..."
 fi
 
 exec /etc/rc.init

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.1.6.5


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