[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.77 and 1.84

version 1.77, 2015/05/03 01:11:52 version 1.84, 2017/03/01 03:20:36
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.76 2015/05/02 23:27:53 andrew Exp $  # $AFresh1: update_openbsd,v 1.83 2016/10/01 20:12:17 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 471 
Line 471 
     local _v=$FILE_VER      local _v=$FILE_VER
     local _args=""      local _args=""
   
     if [ ! -e /usr/share/sysmerge/etc.tgz ]; then      if [ ! -e /var/sysmerge/etc.tgz ]; then
         if [ X"" == X"$RELEASEDIR" ]; then          if [ X"" == X"$RELEASEDIR" ]; then
             echo "ERROR: no source for etc!" >&2              echo "ERROR: no source for etc!" >&2
             exit 1              exit 1
Line 515 
Line 515 
 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`/}  PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
   
 set_version  
   
 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
   
 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 533 
 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: $MIRROR"
 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 583 
Line 587 
     echo "!!!  at the end of the proces but it is safer to  !!!" >&2      echo "!!!  at the end of the proces but it is safer to  !!!" >&2
     echo "!!!  have a separate root shell open.             !!!" >&2      echo "!!!  have a separate root shell open.             !!!" >&2
     echo "!!!  It is needed in order to run /sbin/oreboot.  !!!" >&2      echo "!!!  It is needed in order to run /sbin/oreboot.  !!!" >&2
     echo "!!!  sudo MAY NOT WORK after sets are extracted.  !!!" >&2      echo "!!!  doas MAY NOT WORK after sets are extracted.  !!!" >&2
     echo >&2      echo >&2
     echo "enter to continue, ctrl+C to cancel" >&2      echo "enter to continue, ctrl+C to cancel" >&2
     local _temp      local _temp
Line 611 
Line 615 
     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
Line 624 
Line 628 
     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.77  
changed lines
  Added in v.1.84
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>