[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.101 and 1.121

version 1.101, 2017/12/11 02:34:10 version 1.121, 2019/03/02 01:02:02
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.100 2017/12/11 01:48:08 andrew Exp $  # $AFresh1: update_openbsd,v 1.120 2019/03/02 00:34:34 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 52 
Line 52 
     #what $1 | sed -ne 's/[[:blank:]]\{1,\}//p'      #what $1 | sed -ne 's/[[:blank:]]\{1,\}//p'
 }  }
   
   kernel_is_multiprocessor() {
       printf "find cpu*\nexit\n" | config -e $1 2>/dev/null | grep -q "cpu\* at "
   }
   
 version_in() {  version_in() {
         local _proto=${FTP%%://*}          local _proto=${FTP%%://*}
         local _file          local _file
Line 80 
Line 84 
 }  }
   
 set_boot_device() {  set_boot_device() {
         BOOT_DEVICE=$( df -nP /bsd | sed -ne 's! .*/$!!p' )          BOOT_DEVICE=$( df -lnP /bsd | sed -ne 's! .*/$!!p' )
   
         root_disk=$( echo $BOOT_DEVICE |          root_disk=$( echo $BOOT_DEVICE |
             sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' )              sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' )
Line 96 
Line 100 
   
 boot_device_mounted=""  boot_device_mounted=""
 mount_boot_device() {  mount_boot_device() {
     [ "boot_device_mounted" ] && return      [ "$boot_device_mounted" ] && return
       [ "$BOOT_DEVICE" ] || return
   
     local default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )  
     local boot_mount=$( mount |      local boot_mount=$( mount |
             sed -ne "s!^$BOOT_DEVICE on \([^ ]*\).*!\1!p" )              sed -ne "s!^$BOOT_DEVICE on \([^ ]*\).*!\1!p" )
   
     if [ ! "$boot_mount" ]; then      if [ ! "$boot_mount" ]; then
         mount $BOOT_DEVICE /mnt          mount $BOOT_DEVICE /mnt
         boot_device_mounted=""          boot_device_mounted=1
         KERNEL_ROOT=/mnt  
     elif [ "$boot_mount" != "$default_mount" ]; then  
         KERNEL_ROOT=$boot_mount/  
     else  
         KERNEL_ROOT=${default_mount%/}/  
     fi      fi
 }  }
   
Line 118 
Line 117 
     boot_device_mounted=""      boot_device_mounted=""
 }  }
   
   find_boot_kernel() {
       local _k=$( ( \
           echo bsd; \
           [ -e boot.conf ] && sed -E '/^ *(set +image|boot) +/!d ; \
               s///; s/^.*://; s/ .*$//' boot.conf \
       ) | tail -1 )
       _k=$( follow_symlink $_k )
   
       local _d=$( dirname $_k )
       [ "$_d" = "." ] && _d=$PWD
   
       if [ $_d = . -o $_d = $PWD ]; then
           basename $_k
       else
           echo $_k
       fi
   }
   
 set_version() {  set_version() {
     CUR_VER=`uname -r`      CUR_VER=`uname -r`
     NEW_VER=`dc -e "$CUR_VER 0.1 + p"`      NEW_VER=`dc -e "$CUR_VER 0.1 + p"`
Line 126 
Line 143 
   
     local _cv=`echo $CUR_VER | sed -e 's/\.//'`      local _cv=`echo $CUR_VER | sed -e 's/\.//'`
     local _nv=`echo $NEW_VER | sed -e 's/\.//'`      local _nv=`echo $NEW_VER | sed -e 's/\.//'`
     local _v      local _v _d _pkr
   
     if [ X"No" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then      if [ X"No" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then
         _dir=$FORCE_DIR          _dir=$FORCE_DIR
Line 155 
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 217 
Line 234 
     KERNEL_ROOT=""      KERNEL_ROOT=""
     [ -z "$BOOT_DEVICE" ] && set_boot_device      [ -z "$BOOT_DEVICE" ] && set_boot_device
   
     BOOT_KERNEL=`( \      mount_boot_device
         echo bsd; \  
         [ -e /boot.conf ] && sed -E '/^ *(set +image|boot) +/!d ; \  
             s///; s/^.*://; s/ .*$//' /boot.conf \  
     ) | tail -1`  
     BOOT_KERNEL=`follow_symlink /$BOOT_KERNEL`  
     BOOT_KERNEL="/${BOOT_KERNEL#/}"  
   
     BOOT_KERNEL_VERSION=`kernel_file_version $BOOT_KERNEL`      # _pkr == possible_kernel_roots
       _pkr=/
       [ "$BOOT_DEVICE" ] && _pkr="/mnt/ $_pkr"
   
       for _d in $_pkr; do
           KERNEL_ROOT=$( df -lnP ${_d}bsd 2>/dev/null | sed -ne 's!/dev/.* !!p' )
           [ "$KERNEL_ROOT" ] && break
       done
   
       if ! [ "$KERNEL_ROOT" ]; then
           echo "Unable to find KERNEL_ROOT, tried $_pkr" >&2
           exit 2
       fi
   
       cd $KERNEL_ROOT
       BOOTED_KERNEL=$( find_boot_kernel )
       BOOT_KERNEL_VERSION=$( kernel_file_version $BOOTED_KERNEL )
   
       if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOTED_KERNEL; then
           BOOT_KERNEL=bsd.mp
       else
           BOOT_KERNEL=$BOOTED_KERNEL
       fi
   
     BOOTED_KERNEL_VERSION=`sysctl -n kern.version`      BOOTED_KERNEL_VERSION=`sysctl -n kern.version`
     NEW_KERNEL_VERSION=""      NEW_KERNEL_VERSION=""
   
     # We want to default to what we had      # We want to default to what we had
     INSTALL_KERNELS="${BOOT_KERNEL#/}"      INSTALL_KERNELS="$BOOT_KERNEL"
     # if the boot kernel was our specially named bsd.sp, we install from bsd      # if the boot kernel was our specially named bsd.sp, we install from bsd
     if [ X"$INSTALL_KERNELS" == X"bsd.sp" ]; then      if [ X"$INSTALL_KERNELS" == X"bsd.sp" ]; then
         INSTALL_KERNELS="bsd"          INSTALL_KERNELS="bsd"
     fi      fi
     # with a second option of an mp kernel if is is a likely candidate  
     if [ X"$INSTALL_KERNELS" != X"bsd.mp" ]; then      # We want to update all kernels that exist
         local _ncpu=$(sysctl -n hw.ncpufound)      # either in the $KERNEL_ROOT or in /
         [ $_ncpu -gt 1 ] && INSTALL_KERNELS="$INSTALL_KERNELS bsd.mp"      for b in bsd bsd.mp; do
           [ -e $b -o -e /$b ] || continue
           if [ X"${INSTALL_KERNELS% *}" != X"$b" ]; then
               INSTALL_KERNELS="$INSTALL_KERNELS $b"
           fi
       done
   
       cd $OLDPWD
   
       EFI_BOOT=""
       if [ -d "/mnt/efi/boot" ]; then
           _d=$( cd "/mnt/efi/boot" && ls -1 *.{efi,EFI} 2>/dev/null )
           # assume an MSDOS filesystem and so case insensitive
           [ "$_d" ] && EFI_BOOT=$( echo $_d | tr a-z A-Z )
     fi      fi
     # or just bsd otherwise  
     if [ X"${INSTALL_KERNELS% *}" != X"bsd" ]; then      umount_boot_device
         INSTALL_KERNELS="$INSTALL_KERNELS bsd"  
     fi  
     BOOT_KERNELS=$INSTALL_KERNELS      BOOT_KERNELS=$INSTALL_KERNELS
     INSTALL_KERNELS="$INSTALL_KERNELS bsd.rd"      INSTALL_KERNELS="$INSTALL_KERNELS bsd.rd"
 }  }
Line 261 
Line 306 
   
     local _v=$FILE_VER      local _v=$FILE_VER
   
       if [ "$EFI_BOOT" ]; then
           _b="$EFI_BOOT"
           if [ ! -e ./${_b} ]; then
               echo "===> $FTP_CMD ${FTP}/${_b}"
               $FTP_CMD ${FTP}/${_b}
           else
               echo "===> Have ${_b}"
           fi
       fi
   
     for _b in $INSTALL_KERNELS; do      for _b in $INSTALL_KERNELS; do
         if [ ! -e ./${_b} ]; then          if [ ! -e ./${_b} ]; then
             echo "===> $FTP_CMD ${FTP}/${_b}"              echo "===> $FTP_CMD ${FTP}/${_b}"
Line 349 
Line 404 
     local _missing_sets      local _missing_sets
     local _v=$FILE_VER      local _v=$FILE_VER
   
       mount_boot_device
     for _n in $INSTALL_KERNELS; do      for _n in $INSTALL_KERNELS; do
         local _o=$_n          local _o=$_n
         [ X"bsd" == X"${_o}" -a -e /bsd.sp ] && _o=bsd.sp          [ X"bsd" == X"${_o}" -a -e ${KERNEL_ROOT}bsd.sp ] && _o=bsd.sp
         if [ -e /${_o} -a ! -e ./${_n} ]; then          if [ -e ${KERNEL_ROOT}${_o} -a ! -e ./${_n} ]; then
             echo ${_o} does not exist              echo ${_o} does not exist on $BOOT_DEVICE
             _missing_sets=1              _missing_sets=1
         fi          fi
   
         if [ X"${BOOT_KERNEL}" == X"/${_o}" -a -e ./${_n} ]; then          if [ X"${BOOT_KERNEL}" == X"${_o}" -a -e ./${_n} ]; then
             NEW_KERNEL_VERSION=`kernel_file_version ./${_n}`              NEW_KERNEL_VERSION=`kernel_file_version ./${_n}`
         fi          fi
     done      done
       umount_boot_device
   
     if [ X"$NEW_KERNEL_VERSION" == X"" ]; then      if [ X"$NEW_KERNEL_VERSION" == X"" ]; then
         echo Missing replacement for boot kernel $BOOT_KERNEL >&2          echo Missing replacement for boot kernel $BOOT_KERNEL >&2
Line 397 
Line 454 
   
   
 install_kernels() {  install_kernels() {
     local _d=$1      local _d="$1"
     local default_mount  
     local boot_mount      local boot_mount
     local mount_is_msdos      local mount_is_msdos
   
     if [ ! "$_d" ]; then      if [ "$_d" ]; then
         default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )        _d=$( readlink -nf "$_d" )
       else
         mount_boot_device          mount_boot_device
   
         if [ "$KERNEL_ROOT" != "$default_mount" ]; then          if [ "$KERNEL_ROOT" != "/" ]; then
                 local _ik="$INSTALL_KERNELS"                  local _ik="$INSTALL_KERNELS"
                 INSTALL_KERNELS="${BOOT_KERNEL#/} bsd.rd"                  INSTALL_KERNELS="$BOOT_KERNEL bsd.rd"
   
                 install_kernels $KERNEL_ROOT                  install_kernels $KERNEL_ROOT
   
Line 417 
Line 474 
   
         umount_boot_device          umount_boot_device
   
         install_kernels $default_mount          install_kernels /
         return          return
     fi      fi
   
Line 428 
Line 485 
         exit 1          exit 1
     fi      fi
   
       [ $_d != / ] && _d=${_d%/}/
     [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1      [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1
   
       if [ "$EFI_BOOT" -a -d /mnt/efi/boot ]; then
          echo "Copying $EFI_BOOT to /mnt/efi/boot/"
          ( cd /mnt/efi/boot \
            && cp "$RELEASEDIR/$EFI_BOOT" "n$EFI_BOOT" \
            && mv "n$EFI_BOOT" "$EFI_BOOT"
          )
       fi
   
     if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then      if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
         echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"          echo "===> Backing up ${_d}$BOOTED_KERNEL to ${_d}obsd"
         if [ $mount_is_msdos ]; then          if [ $mount_is_msdos ]; then
             cp $BOOT_KERNEL ${_d}obsd              cp ${_d}$BOOTED_KERNEL ${_d}obsd
         else          else
             ln -f $BOOT_KERNEL ${_d}obsd              ln -f ${_d}$BOOTED_KERNEL ${_d}obsd
         fi          fi
         if [ $? -ne 0 ]; then          if [ $? -ne 0 ]; then
             echo "Error copying old kernel!" >&2              echo "Error copying old kernel!" >&2
Line 583 
Line 649 
     . ${HOME}/.update_openbsdrc      . ${HOME}/.update_openbsdrc
 fi  fi
   
 MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD}  MIRROR=${MIRROR:=http://cdn.openbsd.org/pub/OpenBSD}
 FTP_CMD=${FTP_CMD:=ftp -V}  FTP_CMD=${FTP_CMD:=ftp -V}
   
 DESTDIR=${DESTDIR:=/}  DESTDIR=${DESTDIR:=/}
Line 618 
Line 684 
 echo "      RELEASEDIR: $RELEASEDIR"  echo "      RELEASEDIR: $RELEASEDIR"
 echo "         DESTDIR: $DESTDIR"  echo "         DESTDIR: $DESTDIR"
 echo "     BOOT_DEVICE: $BOOT_DEVICE"  echo "     BOOT_DEVICE: $BOOT_DEVICE"
   [ "$EFI_BOOT" ] && echo "        EFI_BOOT: $EFI_BOOT"
 echo "     BOOT_KERNEL: $BOOT_KERNEL"  echo "     BOOT_KERNEL: $BOOT_KERNEL"
 echo " INSTALL_KERNELS: $INSTALL_KERNELS"  echo " INSTALL_KERNELS: $INSTALL_KERNELS"
 echo "  INSTALLED_SETS: $INSTALLED_SETS"  echo "  INSTALLED_SETS: $INSTALLED_SETS"
Line 627 
Line 694 
 #echo "        FILE_VER: $FILE_VER"  #echo "        FILE_VER: $FILE_VER"
 echo  echo
   
   mount_boot_device
   l=$KERNEL_ROOT
   [ "$l" = / ] || l="$BOOT_DEVICE:"
 for k in $INSTALL_KERNELS; do  for k in $INSTALL_KERNELS; do
     if [ -e "/$k" ]; then      if [ -e $KERNEL_ROOT$k ]; then
         echo "Existing $k"          echo "Existing $l$k"
         kernel_file_version "/$k"          kernel_file_version $KERNEL_ROOT$k
     fi      fi
 done  done
   umount_boot_device
   
 if [ ${_error} -ne 0 ]; then  if [ ${_error} -ne 0 ]; then
         exit ${_error}          exit ${_error}
Line 647 
Line 718 
 echo "===> Last booted:\n$BOOTED_KERNEL_VERSION"  echo "===> Last booted:\n$BOOTED_KERNEL_VERSION"
 if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \  if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
   -a X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then    -a X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
     echo "Next boot (unless replaced):\n$BOOT_KERNEL_VERSION"      echo "Next boot $BOOTED_KERNEL (unless replaced):\n$BOOT_KERNEL_VERSION"
 fi  fi
 if [ -n "$NEW_KERNEL_VERSION" ]; then  if [ -n "$NEW_KERNEL_VERSION" ]; then
     echo "===> New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION";      echo "===> New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION";
Line 692 
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 )
Legend:
Removed from v.1.101  
changed lines
  Added in v.1.121
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>