[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.23 and 1.29

version 1.23, 2009/05/15 00:00:46 version 1.29, 2009/12/10 06:51:28
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $RedRiver: update_openbsd,v 1.22 2009/05/13 16:40:50 andrew Exp $  # $RedRiver: update_openbsd,v 1.28 2009/12/10 06:09:40 andrew Exp $
   
 installed_sets() {  installed_sets() {
     local misc=/usr/share/doc/README      local misc=/usr/share/doc/README
Line 24 
Line 24 
         fi          fi
     done      done
   
     sendmail -d0.1 root < /dev/null | grep -q SASL      sendmail -d0.1 -bt < /dev/null | grep -q SASL
     if [ $? == 0 ]; then      if [ $? == 0 ]; then
         echo -n ' sendmail-smtp_auth'          echo -n ' sendmail-smtp_auth'
     fi      fi
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" ]; then              if [ X"${_true_bsd}" == X"bsd.sp" ]; then
                 _installed_new_bsd=1                  _installed_new_bsd=1
             fi              fi
         else          else
Line 459 
Line 460 
             echo ERROR: No upgrade sets found! >&2              echo ERROR: No upgrade sets found! >&2
         else          else
             echo '### RUNNING SYSMERGE ###'              echo '### RUNNING SYSMERGE ###'
             _args="-a $_args"              if sysmerge 2>&1 | grep -- -a >/dev/null; then
                   _args="-a $_args"
               fi
             $SUDO $SYSMERGE $_args              $SUDO $SYSMERGE $_args
         fi          fi
     fi      fi
Line 536 
Line 539 
   
 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${_v}.html"      echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"
 fi  fi
   
 echo New kernel installed.  Please reboot!  echo New kernel installed.  Please reboot!

Legend:
Removed from v.1.23  
changed lines
  Added in v.1.29

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