[BACK]Return to rc CVS log [TXT][DIR] Up to [local] / src / etc

Diff for /src/etc/rc between version 1.506 and 1.507

version 1.506, 2017/06/30 17:06:03 version 1.507, 2017/07/04 19:02:11
Line 221 
Line 221 
   
 # Re-link the kernel, placing the objects in a random order.  # Re-link the kernel, placing the objects in a random order.
 # Replace current with relinked kernel and inform root about it.  # Replace current with relinked kernel and inform root about it.
 reorder_kernel() {  reorder_kernel() (
         local _dkdev=$(df /usr/share | sed '1d;s/ .*//')          local _dkdev=$(df /usr/share | sed '1d;s/ .*//')
   
         # Skip if /usr/share is on a nfs mounted filesystem.          # Skip if /usr/share is on a nfs mounted filesystem.
         [[ $(mount | grep "^$_dkdev") == *" type nfs "* ]] && return          [[ $(mount | grep "^$_dkdev") == *" type nfs "* ]] && return
   
         (  
         set -e  
         trap 'trap - EXIT; mail -s "$(hostname) Kernel relink failed" root \  
                 </var/log/kernel_relink.log' ERR  
         trap 'mail -s "$(hostname) Kernel relink info" root \  
                 </var/log/kernel_relink.log' EXIT  
   
         _compile=/usr/share/compile          _compile=/usr/share/compile
         _kernel=$(sysctl -n kern.osversion)          _kernel=$(sysctl -n kern.osversion)
         _kernel=${_kernel%#*}          _kernel=${_kernel%#*}
           _log=$_compile/$_kernel/relink.log
         _sha256=/var/db/kernel.SHA256          _sha256=/var/db/kernel.SHA256
   
           mkdir -m 700 -p $_compile/$_kernel
           exec 1>$_log
           exec 2>&1
   
           trap 'trap - EXIT; logger -st /etc/rc \
                   "kernel relinking failed; see $_log" >>/dev/console 2>&1' ERR
           trap 'logger -t /etc/rc "kernel relinking done"' EXIT
           set -e
   
         if [[ -f $_compile.tgz ]]; then          if [[ -f $_compile.tgz ]]; then
                 rm -rf $_compile                  rm -rf $_compile/$_kernel/*
                 mkdir -m 700 -p $_compile                  exec 1>$_log
                 tar -C $_compile -xzf $_compile.tgz $_kernel                  tar -C $_compile -xzf $_compile.tgz $_kernel
                 rm -f $_compile.tgz                  rm -f $_compile.tgz
         fi          fi
   
         sha256 -q -C $_sha256 /bsd          sha256 -C $_sha256 /bsd
   
         cd $_compile/$_kernel          cd $_compile/$_kernel
         make newbsd          make newbsd
Line 254 
Line 257 
   
         echo "\nKernel has been relinked and is active on next reboot.\n"          echo "\nKernel has been relinked and is active on next reboot.\n"
         cat $_sha256          cat $_sha256
         ) >/var/log/kernel_relink.log 2>&1 &  )
 }  
   
 # Run rc.* script and email output to root.  # Run rc.* script and email output to root.
 # Usage: run_upgrade_script firsttime|sysmerge  # Usage: run_upgrade_script firsttime|sysmerge
Line 619 
Line 621 
 start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xenodm  start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xenodm
 echo '.'  echo '.'
   
 reorder_kernel  reorder_kernel &
   
 date  date
 exit 0  exit 0

Legend:
Removed from v.1.506  
changed lines
  Added in v.1.507