[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.119 and 1.122

version 1.119, 2018/12/16 23:42:07 version 1.122, 2019/03/02 01:04:52
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.118 2018/12/16 21:10:00 andrew Exp $  # $AFresh1: update_openbsd,v 1.121 2019/03/02 01:02:02 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 172 
Line 172 
     if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then      if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then
         if [ X"No" != X"${FORCE_DIR}" ]; then          if [ X"No" != X"${FORCE_DIR}" ]; then
             _dir=${FORCE_DIR}              _dir=${FORCE_DIR}
         elif sysctl kern.version | grep -q -- '-current '; then          elif sysctl kern.version | grep -q -e '-current ' -e '-beta '; then
             _dir=snapshots              _dir=snapshots
             FORCE_DIR=snapshots              FORCE_DIR=snapshots
         else          else
Line 546 
Line 546 
         done          done
         cd $OLDPWD          cd $OLDPWD
     fi      fi
   
     echo "===> Updating /var/db/kernel.SHA256"  
     sha256 -h /var/db/kernel.SHA256 ${_d}/bsd  
 }  }
   
 install_sets() {  install_sets() {
Line 756 
Line 753 
     fi      fi
 fi  fi
   
 if [ $( ls -1 /usr/share/relink/ 2>/dev/null | wc -l ) -gt 0 ]; then  
     echo "==> REMOVING /usr/share/relink/*"  
     rm -rf /usr/share/relink/*  
 fi  
   
 install_kernels  install_kernels
 install_sets  install_sets
   
Line 771 
Line 763 
         echo Removing /sbin/oreboot          echo Removing /sbin/oreboot
         rm -f /sbin/oreboot          rm -f /sbin/oreboot
     fi      fi
   
       echo "===> Relinking to create unique kernel..."
       sha256 -h /var/db/kernel.SHA256 /bsd
       /usr/libexec/reorder_kernel
   
     update_etc      update_etc
   
     OPENUP=$( which openup 2>/dev/null )      OPENUP=$( which openup 2>/dev/null )
Line 778 
Line 775 
         echo "==> UPDATING WITH $OPENUP"          echo "==> UPDATING WITH $OPENUP"
         $OPENUP          $OPENUP
     else      else
           if [ X"snapshots" != X"$FORCE_DIR" ]; then
               echo '==> Running syspatch'
               syspatch
           fi
         echo '==> UPDATING PACKAGES'          echo '==> UPDATING PACKAGES'
         pkg_add -u          pkg_add -u
     fi      fi
Legend:
Removed from v.1.119  
changed lines
  Added in v.1.122
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>