[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.96 and 1.97

version 1.96, 2017/12/10 21:20:53 version 1.97, 2017/12/11 00:52:41
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.95 2017/12/10 21:19:11 andrew Exp $  # $AFresh1: update_openbsd,v 1.96 2017/12/10 21:20:53 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 79 
Line 79 
         echo $_v          echo $_v
 }  }
   
   set_boot_partition() {
           BOOT_PARTITION=$( df -nP /bsd | sed -ne 's! .*/$!!p' )
   
           root_disk=$( echo $BOOT_PARTITION |
               sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' )
           msdos_partition=$(
               fdisk $root_disk | grep -q '^*.*FAT32' \
               && \
               disklabel $root_disk | sed -ne 's/:.*MSDOS//p' | tr -d ' '
           )
   
           [ "$msdos_partition" ] &&
               BOOT_PARTITION="/dev/$root_disk$msdos_partition"
   }
   
 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 355 
Line 370 
   
   
 install_kernels() {  install_kernels() {
     echo '==> INSTALLING KERNEL'      local _d=$1
       local default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )
       local boot_mount
       local mount_is_msdos
   
       if [ ! "$_d" ]; then
           boot_mount=$( mount |
               sed -ne "s!^$BOOT_PARTITION on \([^ ]*\).*!\1!p" )
   
           local _ik="$INSTALL_KERNELS"
           INSTALL_KERNELS="${BOOT_KERNEL#/} bsd.rd"
   
           if [ ! "$boot_mount" ]; then
                   mount $BOOT_PARTITION /mnt
                   install_kernels /mnt/
                   umount $BOOT_PARTITION
           elif [ "$boot_mount" != "$default_mount" ]; then
                   install_kernels $boot_mount/
           fi
   
           INSTALL_KERNELS="$_ik"
           install_kernels $default_mount
           return
       fi
   
       echo "==> INSTALLING KERNEL to $_d"
   
     if [ X"" == X"$RELEASEDIR" ]; then      if [ X"" == X"$RELEASEDIR" ]; then
         echo ERROR: no source for new kernels! >&2          echo ERROR: no source for new kernels! >&2
         exit 1          exit 1
     fi      fi
   
       mount | grep -q " ${_d%/} .* msdos" && mount_is_msdos=1
   
     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 /obsd"          echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"
         ln -f $BOOT_KERNEL /obsd          if [ $mount_is_msdos ]; then
               cp $BOOT_KERNEL ${_d}obsd
           else
               ln -f $BOOT_KERNEL ${_d}obsd
           fi
         if [ $? -ne 0 ]; then          if [ $? -ne 0 ]; then
             echo "Error copying old kernel!" >&2              echo "Error copying old kernel!" >&2
             exit 1              exit 1
Line 374 
Line 420 
     cd $RELEASEDIR      cd $RELEASEDIR
   
     for _b in $INSTALL_KERNELS; do      for _b in $INSTALL_KERNELS; do
         rm -f /nbsd          rm -f ${_d}nbsd
         local _bd=$_b          local _bd=$_b
         [ X"${_b}" == X"bsd" ] && _bd="bsd.sp"          [ X"${_b}" == X"bsd" ] && _bd="bsd.sp"
   
         local _is_boot=""          local _is_boot=""
         [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"          [ X"$BOOT_KERNEL" == X"${_d}${_bd}" ] && _is_boot="# boot kernel"
   
         echo "Copying $_b to /$_bd $_is_boot"          echo "Copying $_b to ${_d}$_bd $_is_boot"
         cp ${_b} /nbsd && mv /nbsd /${_bd}          cp ${_b} ${_d}nbsd && mv ${_d}nbsd ${_d}${_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
             exit 1              exit 1
Line 391 
Line 437 
   
     cd $OLDPWD      cd $OLDPWD
   
     if [ ! -h /bsd ]; then      if [ ! -h ${_d}bsd ]; then
             cd /          cd ${_d}
         for _b in $BOOT_KERNELS; do          for _b in $BOOT_KERNELS; do
             [ X"$_b" == X"bsd" ] && _b="bsd.sp"              [ X"$_b" == X"bsd" ] && _b="bsd.sp"
             if [ -e $_b ]; then              if [ -e $_b ]; then
                 echo "===> symlinking $_b to /bsd"                  if [ "$mount_is_msdos" ]; then
                 ln -sf $_b bsd                      echo "===> Moving $_b ${_d}bsd (MSDOS)"
                 if [ $? -ne 0 ]; then                      mv -f ${_b} bsd
                     echo ERROR: Could not symlink new kernel! >&2                  else
                     exit 1                      echo "===> symlinking $_b to ${_d}bsd"
                       ln -sf $_b bsd
                 fi                  fi
                 break                  break
             fi              fi
         done          done
             cd $OLDPWD          cd $OLDPWD
     fi      fi
 }  }
   
Line 520 
Line 567 
 export PKG_PATH TRUSTED_PKG_PATH  export PKG_PATH TRUSTED_PKG_PATH
   
 set_version  set_version
   [ -z "$BOOT_PARTITION" ] && set_boot_partition
   
 TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all}  TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all}
 if [ "$FORCE_DIR" = "No" ]; then  if [ "$FORCE_DIR" = "No" ]; then
Line 544 
Line 592 
 echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"  echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"
 echo "      RELEASEDIR: $RELEASEDIR"  echo "      RELEASEDIR: $RELEASEDIR"
 echo "         DESTDIR: $DESTDIR"  echo "         DESTDIR: $DESTDIR"
   echo "  BOOT_PARTITION: $BOOT_PARTITION"
 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"
Legend:
Removed from v.1.96  
changed lines
  Added in v.1.97
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>