[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.25 and 1.28

version 1.25, 2009/06/13 17:34:46 version 1.28, 2009/12/10 06:09:40
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $RedRiver: update_openbsd,v 1.24 2009/05/29 21:47:37 andrew Exp $  # $RedRiver: update_openbsd,v 1.27 2009/12/04 04:26:36 andrew Exp $
   
 installed_sets() {  installed_sets() {
     local misc=/usr/share/doc/README      local misc=/usr/share/doc/README
Line 326 
Line 326 
                     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 459 
Line 459 
             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 538 
   
 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.25  
changed lines
  Added in v.1.28

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