[BACK]Return to update_openbsd CVS log [TXT][DIR] Up to [local] / openbsd / update_openbsd

Diff for /openbsd/update_openbsd/update_openbsd between version 1.28 and 1.33

version 1.28, 2009/12/10 06:09:40 version 1.33, 2009/12/31 16:48:19
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $RedRiver: update_openbsd,v 1.27 2009/12/04 04:26:36 andrew Exp $  # $RedRiver: update_openbsd,v 1.32 2009/12/10 19:34:39 andrew Exp $
   
 installed_sets() {  installed_sets() {
     local misc=/usr/share/doc/README      local misc=/usr/share/doc/README
Line 193 
Line 193 
   
 follow_symlink () {  follow_symlink () {
     local _file=$1      local _file=$1
     local _next=$( file $_file |      # This could go circular, but I dunno how to fix that.
         grep 'symbolic link' |      if [ -h $_file ]; then
         sed -e s/^.*\\\`// -e s/\\\'\$// )          follow_symlink $( file $_file |
     if [ -h $_next ]; then              grep 'symbolic link' |
         follow_symlink $_next              sed -e s/^.*\\\`// -e s/\\\'\$// )
     else      else
         echo $_next          echo $_file
     fi      fi
 }  }
   
Line 265 
Line 265 
 }  }
   
   
 install_kernel() {  install_kernels() {
     echo '### INSTALLING KERNEL ###'      echo '### INSTALLING KERNEL ###'
     if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then      if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
         echo ${0##*/} must be run as root or SUDO must be set! >&2          echo ${0##*/} must be run as root or SUDO must be set! >&2
Line 304 
Line 304 
     fi      fi
   
     local _true_bsd=`follow_symlink /bsd`      local _true_bsd=`follow_symlink /bsd`
       _true_bsd=${_true_bsd#/}
     local _installed_new_bsd      local _installed_new_bsd
   
     for _b in bsd*; do      for _b in bsd*; do
Line 315 
Line 316 
                 echo ERROR: Could not copy new SP kernel! >&2                  echo ERROR: Could not copy new SP kernel! >&2
                 exit 1                  exit 1
             fi              fi
             if [ X"${_true_bsd}" == X"/bsd.sp" ]; then              if [ X"${_true_bsd}" == X"bsd.sp" ]; then
                 _installed_new_bsd=1                  _installed_new_bsd=1
             fi              fi
         else          else
             if [ -e /$_b ]; then              if [ -e "/${_b}" ]; then
                 echo Copying $_b to /                  echo Copying $_b to /
                 $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b}                  $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b}
                 if [ $? -ne 0 ]; then                  if [ $? -ne 0 ]; then
                     echo ERROR: Could not copy new $_b kernel! >&2                      echo ERROR: Could not copy new $_b kernel! >&2
                     exit 1                      exit 1
                 fi                  fi
                 if [ X"${_true_bsd}" == X"/${_b}" ]; then                  if [ X"${_true_bsd}" == X"${_b}" ]; then
                     _installed_new_bsd=1                      _installed_new_bsd=1
                 fi                  fi
             fi              fi
Line 449 
Line 450 
         fi          fi
   
         local _v=$FILE_VER          local _v=$FILE_VER
           local _args=""
         if [ -e etc${_v}.tgz ]; then          if [ -e etc${_v}.tgz ]; then
             _args="$_args -s etc${_v}.tgz"              _args="$_args -s etc${_v}.tgz"
         fi          fi
Line 523 
Line 525 
     $SUDO -v      $SUDO -v
 fi  fi
   
 install_kernel  install_kernels
 install_sets  install_sets
   
 if [ $CUR_VER == $NEW_VER ]; then  if [ $CUR_VER == $NEW_VER ]; then
Line 538 
Line 540 
   
 else  else
     echo Instructions for updating to the new version available from      echo Instructions for updating to the new version available from
     echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"      if [ X"snapshots" != X"$FORCE_DIR" ]; then
           echo "  http://www.openbsd.org/faq/current.html"
       else
           echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"
       fi
 fi  fi
   
 echo New kernel installed.  Please reboot!  echo New kernel installed.  Please reboot!
 if [ -e /sbin/oreboot ]; then  if [ -e /sbin/oreboot ]; then
     echo Possibly using /sbin/oreboot      echo Possibly using /sbin/oreboot
   fi
   
   local _send_dmesg=`dirname $0`/send_dmesg
   if [ -e "$_send_dmesg" ]; then
       if [ -e $RELEASEDIR/.send_dmesg ]; then
           $_send_dmesg
           rm -f $RELEASEDIR/.send_dmesg
       elif [ X"$CUR_VER" != X"$NEW_VER" ]; then
           touch $RELEASEDIR/.send_dmesg
       fi
 fi  fi
Legend:
Removed from v.1.28  
changed lines
  Added in v.1.33
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>