[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.105 and 1.118

version 1.105, 2017/12/11 02:58:57 version 1.118, 2018/12/16 21:10:00
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.103 2017/12/11 02:50:09 andrew Exp $  # $AFresh1: update_openbsd,v 1.117 2018/12/16 20:57:49 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 84 
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 101 
Line 101 
 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=1          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 148 
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 240 
Line 235 
     [ -z "$BOOT_DEVICE" ] && set_boot_device      [ -z "$BOOT_DEVICE" ] && set_boot_device
   
     mount_boot_device      mount_boot_device
   
       # _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      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 )
     kernel_is_multiprocessor $BOOT_KERNEL && BOOT_KERNEL=bsd.mp  
     cd $OLDPWD  
     umount_boot_device  
   
       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=""
   
Line 256 
Line 269 
     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 281 
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 419 
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"
   
Line 439 
Line 474 
   
         umount_boot_device          umount_boot_device
   
         install_kernels $default_mount          install_kernels /
         return          return
     fi      fi
   
Line 450 
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 605 
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 640 
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 650 
Line 695 
 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 671 
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";
Legend:
Removed from v.1.105  
changed lines
  Added in v.1.118
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>