[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.80 and 1.93

version 1.80, 2015/11/27 22:38:38 version 1.93, 2017/11/28 03:54:31
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.79 2015/11/03 03:56:53 andrew Exp $  # $AFresh1: update_openbsd,v 1.92 2017/11/28 03:29:59 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 60 
Line 60 
             local _list=`echo "ls base*.tgz" | ${FTP_CMD} ${FTP}/`              local _list=`echo "ls base*.tgz" | ${FTP_CMD} ${FTP}/`
             _file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'`              _file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'`
   
         elif [ X"http" == X"${_proto}" ]; then          elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then
             local _list=`${FTP_CMD} -V -o - ${FTP}/`              local _list=`${FTP_CMD} -V -o - ${FTP}/`
             _file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ {              _file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ {
                     sub("^.*base","base");                      sub("^.*base","base");
Line 118 
Line 118 
     fi      fi
   
     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=${NEW_VER}  
         else  
             _dir=${FORCE_DIR}              _dir=${FORCE_DIR}
           elif sysctl kern.version | grep -q -- '-current '; then
               _dir=snapshots
               FORCE_DIR=snapshots
           else
               _dir=${NEW_VER}
         fi          fi
         FTP=${MIRROR}/${_dir}/`machine`          FTP=${MIRROR}/${_dir}/`machine`
   
Line 339 
Line 342 
     done      done
   
     if [ X"" == X"${_missing_sets}" ]; then      if [ X"" == X"${_missing_sets}" ]; then
         echo '===> All OK'          echo 'All OK'
     fi      fi
   
     local _type      local _type
Line 382 
Line 385 
         local _is_boot=""          local _is_boot=""
         [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"          [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"
   
         echo "===> Copying $_b to /$_bd $_is_boot"          echo "Copying $_b to /$_bd $_is_boot"
         cp ${_b} /nbsd && mv /nbsd /${_bd}          cp ${_b} /nbsd && mv /nbsd /${_bd}
         if [ $? -ne 0 ]; then          if [ $? -ne 0 ]; then
             echo ERROR: Could not copy new $_bd kernel! >&2              echo ERROR: Could not copy new $_bd kernel! >&2
Line 431 
Line 434 
             _path=/var/tmp/temproot              _path=/var/tmp/temproot
         fi          fi
   
         echo "===> Extracting $_f to $_path"          echo "Extracting $_f to $_path"
         mkdir -p $_path          mkdir -p $_path
         tar -C $_path -xzphf ${RELEASEDIR}/${_f}          tar -C $_path -xzphf ${RELEASEDIR}/${_f}
         if [ $? -ne 0 ]; then          if [ $? -ne 0 ]; then
Line 511 
Line 514 
     . ${HOME}/.update_openbsdrc      . ${HOME}/.update_openbsdrc
 fi  fi
   
 #MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD}  MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD}
 FTP_CMD=${FTP_CMD:=ftp -V}  FTP_CMD=${FTP_CMD:=ftp -V}
 PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}  
   
 DESTDIR=${DESTDIR:=/}  DESTDIR=${DESTDIR:=/}
 SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}  SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}
 FORCE_DIR=${FORCE_DIR:=No}  FORCE_DIR=${FORCE_DIR:=No}
   
   export PKG_PATH TRUSTED_PKG_PATH
   
 set_version  set_version
   
   PKG_PATH=${PKG_PATH:=${MIRROR}/${FORCE_DIR:=$NEW_VER}/packages/`machine -a`/}
   TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all/}
   
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}  INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
   
 CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}  CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}
Line 531 
Line 538 
 echo "-= update_openbsd - helper script to update OpenBSD =-"  echo "-= update_openbsd - helper script to update OpenBSD =-"
 echo "------------------------------------------------------"  echo "------------------------------------------------------"
 echo  echo
 echo "       SYSMERGE: $SYSMERGE"  echo "        SYSMERGE: $SYSMERGE"
 echo "         MIRROR: $MIRROR"  echo "          MIRROR: $FTP"
 echo "     RELEASEDIR: $RELEASEDIR"  echo "        PKG_PATH: $PKG_PATH"
 echo "        DESTDIR: $DESTDIR"  echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"
 echo "    BOOT_KERNEL: $BOOT_KERNEL"  echo "      RELEASEDIR: $RELEASEDIR"
 echo "INSTALL_KERNELS: $INSTALL_KERNELS"  echo "         DESTDIR: $DESTDIR"
 echo " INSTALLED_SETS: $INSTALLED_SETS"  echo "     BOOT_KERNEL: $BOOT_KERNEL"
   echo " INSTALL_KERNELS: $INSTALL_KERNELS"
   echo "  INSTALLED_SETS: $INSTALLED_SETS"
 echo  echo
 echo "        CUR_VER: $CUR_VER"  echo "         CUR_VER: $CUR_VER"
 echo "        NEW_VER: $NEW_VER"  echo "         NEW_VER: $NEW_VER"
 #echo "       FILE_VER: $FILE_VER"  #echo "        FILE_VER: $FILE_VER"
 echo  echo
   
 for k in $INSTALL_KERNELS; do  for k in $INSTALL_KERNELS; do
Line 611 
Line 620 
     fi      fi
     update_etc      update_etc
   
     OPENUP=$( which openup )      OPENUP=$( which openup 2>/dev/null )
     if [ -n "$OPENUP" ]; then      if [ -n "$OPENUP" ]; then
         echo "==> UPDATING WITH $OPENUP"          echo "==> UPDATING WITH $OPENUP"
         $OPENUP          $OPENUP
     else      else
         echo '==> UPDATING PACKAGES'          echo '==> UPDATING PACKAGES'
         pkg_add -ui -F update -F updatedepends          pkg_add -u
     fi      fi
   
     echo '==> UPDATING FIRMWARE'      echo '==> UPDATING FIRMWARE'
     fw_update      fw_update
   
 else  else
       [ -e /etc/rc.sysmerge ] && grep -q $SYSMERGE /etc/rc.sysmerge ||
           echo "$SYSMERGE -b" >>/etc/rc.sysmerge &&
           echo "==> RUNNING $SYSMERGE -b ON REBOOT"
   
     echo Instructions for updating to the new version available from      echo Instructions for updating to the new version available from
     if [ X"snapshots" == X"$FORCE_DIR" ]; then      if [ X"snapshots" == X"$FORCE_DIR" ]; then
         echo "  http://www.openbsd.org/faq/current.html"          echo "  http://www.openbsd.org/faq/current.html"
Legend:
Removed from v.1.80  
changed lines
  Added in v.1.93
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>