[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.111 and 1.120

version 1.111, 2018/12/16 20:12:16 version 1.120, 2019/03/02 00:34:34
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.110 2018/09/30 23:31:27 andrew Exp $  # $AFresh1: update_openbsd,v 1.119 2018/12/16 23:42:07 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 245 
Line 245 
         [ "$KERNEL_ROOT" ] && break          [ "$KERNEL_ROOT" ] && break
     done      done
   
     if ![ "$KERNEL_ROOT" ]; then      if ! [ "$KERNEL_ROOT" ]; then
         echo "Unable to find KERNEL_ROOT, tried $_pkr" >&2          echo "Unable to find KERNEL_ROOT, tried $_pkr" >&2
         exit 2          exit 2
     fi      fi
   
     cd $KERNEL_ROOT      cd $KERNEL_ROOT
     BOOT_KERNEL=$( find_boot_kernel )      BOOTED_KERNEL=$( find_boot_kernel )
     BOOT_KERNEL_VERSION=$( kernel_file_version $BOOT_KERNEL )      BOOT_KERNEL_VERSION=$( kernel_file_version $BOOTED_KERNEL )
     if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOT_KERNEL; then  
       if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOTED_KERNEL; then
         BOOT_KERNEL=bsd.mp          BOOT_KERNEL=bsd.mp
       else
           BOOT_KERNEL=$BOOTED_KERNEL
     fi      fi
   
     BOOTED_KERNEL_VERSION=`sysctl -n kern.version`      BOOTED_KERNEL_VERSION=`sysctl -n kern.version`
Line 277 
Line 280 
     done      done
   
     cd $OLDPWD      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
   
     umount_boot_device      umount_boot_device
   
     BOOT_KERNELS=$INSTALL_KERNELS      BOOT_KERNELS=$INSTALL_KERNELS
Line 295 
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 467 
Line 488 
     [ $_d != / ] && _d=${_d%/}/      [ $_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 ${_d}$BOOT_KERNEL ${_d}obsd              cp ${_d}$BOOTED_KERNEL ${_d}obsd
         else          else
             ln -f ${_d}$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 517 
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 655 
Line 687 
 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 665 
Line 698 
 echo  echo
   
 mount_boot_device  mount_boot_device
   l=$KERNEL_ROOT
   [ "$l" = / ] || l="$BOOT_DEVICE:"
 for k in $INSTALL_KERNELS; do  for k in $INSTALL_KERNELS; do
     if [ -e $KERNEL_ROOT$k ]; then      if [ -e $KERNEL_ROOT$k ]; then
         echo "Existing $BOOT_DEVICE:$k"          echo "Existing $l$k"
         kernel_file_version $KERNEL_ROOT$k          kernel_file_version $KERNEL_ROOT$k
     fi      fi
 done  done
Line 686 
Line 721 
 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 719 
Line 754 
         fi          fi
         echo "/sbin/reboot copied to /sbin/oreboot"          echo "/sbin/reboot copied to /sbin/oreboot"
     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  fi
   
 install_kernels  install_kernels
Legend:
Removed from v.1.111  
changed lines
  Added in v.1.120
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>