[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.66 and 1.69

version 1.66, 2014/02/01 22:07:04 version 1.69, 2014/10/19 00:05:49
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.65 2014/02/01 19:13:53 andrew Exp $  # $AFresh1: update_openbsd,v 1.68 2014/10/18 22:42:35 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 271 
Line 271 
   
     local _nv=`echo $NEW_VER | sed -e 's/\.//'`      local _nv=`echo $NEW_VER | sed -e 's/\.//'`
     local _signify=`which signify 2>/dev/null`      local _signify=`which signify 2>/dev/null`
     local _keyfile=/etc/signify/${_nv}base.pub      local _keyfile=/etc/signify/openbsd-${_nv}-base.pub
     local _b _s      local _b _s
   
     (      (
Line 286 
Line 286 
             echo "key [$_keyfile] does not exist, cannot check $_type" >&2              echo "key [$_keyfile] does not exist, cannot check $_type" >&2
             return 2              return 2
         fi          fi
         signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sum -c -          signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sha256 -c -
     else      else
        grep -f index $_type | sum -c         grep -f index $_type | sum -c
     fi      fi
Line 462 
Line 462 
         exit 1;          exit 1;
     fi      fi
   
     if [ X"" == X"$RELEASEDIR" ]; then  
         echo "ERROR: no source for etc!" >&2  
         exit 1  
     fi  
   
     cd $RELEASEDIR  
   
     local _v=$FILE_VER      local _v=$FILE_VER
     local _args=""      local _args=""
     if [ -e etc${_v}.tgz ]; then  
         _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz"      if [ ! -e /usr/share/sysmerge/etc.tgz ]; then
           if [ X"" == X"$RELEASEDIR" ]; then
               echo "ERROR: no source for etc!" >&2
               exit 1
           fi
   
           cd $RELEASEDIR
   
           if [ -e etc${_v}.tgz ]; then
               _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz"
           fi
           if [ -e xetc${_v}.tgz ]; then
               _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz"
           fi
           if [ X"" == X"$_args" ]; then
               echo ERROR: No upgrade sets found! >&2
               exit 1
           fi
     fi      fi
     if [ -e xetc${_v}.tgz ]; then  
         _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz"  
     fi  
     if [ X"" == X"$_args" ]; then  
         echo ERROR: No upgrade sets found! >&2  
     else  
         echo '==> RUNNING SYSMERGE'  
         $SYSMERGE $_args  
     fi  
   
       echo '==> RUNNING SYSMERGE'
       $SYSMERGE $_args
   
     cd $OLDPWD      cd $OLDPWD
 }  }
   
Line 589 
Line 593 
   
     if [ -e /sbin/oreboot ]; then      if [ -e /sbin/oreboot ]; then
         echo Removing /sbin/oreboot          echo Removing /sbin/oreboot
         $rm -f /sbin/oreboot          rm -f /sbin/oreboot
     fi      fi
     update_etc      update_etc
   
Legend:
Removed from v.1.66  
changed lines
  Added in v.1.69
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>