=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.97 retrieving revision 1.105 diff -u -r1.97 -r1.105 --- openbsd/update_openbsd/update_openbsd 2017/12/11 00:52:41 1.97 +++ openbsd/update_openbsd/update_openbsd 2017/12/11 02:58:57 1.105 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.96 2017/12/10 21:20:53 andrew Exp $ +# $AFresh1: update_openbsd,v 1.103 2017/12/11 02:50:09 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -52,6 +52,10 @@ #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() { local _proto=${FTP%%://*} local _file @@ -79,10 +83,10 @@ echo $_v } -set_boot_partition() { - BOOT_PARTITION=$( df -nP /bsd | sed -ne 's! .*/$!!p' ) +set_boot_device() { + BOOT_DEVICE=$( df -nP /bsd | sed -ne 's! .*/$!!p' ) - root_disk=$( echo $BOOT_PARTITION | + root_disk=$( echo $BOOT_DEVICE | sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' ) msdos_partition=$( fdisk $root_disk | grep -q '^*.*FAT32' \ @@ -91,9 +95,51 @@ ) [ "$msdos_partition" ] && - BOOT_PARTITION="/dev/$root_disk$msdos_partition" + BOOT_DEVICE="/dev/$root_disk$msdos_partition" } +boot_device_mounted="" +mount_boot_device() { + [ "$boot_device_mounted" ] && return + + local default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' ) + local boot_mount=$( mount | + sed -ne "s!^$BOOT_DEVICE on \([^ ]*\).*!\1!p" ) + + if [ ! "$boot_mount" ]; then + mount $BOOT_DEVICE /mnt + boot_device_mounted=1 + KERNEL_ROOT=/mnt + elif [ "$boot_mount" != "$default_mount" ]; then + KERNEL_ROOT=$boot_mount/ + else + KERNEL_ROOT=${default_mount%/}/ + fi +} + +umount_boot_device() { + [ "$boot_device_mounted" ] && umount $BOOT_DEVICE + 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() { CUR_VER=`uname -r` NEW_VER=`dc -e "$CUR_VER 0.1 + p"` @@ -190,21 +236,22 @@ FTP=${MIRROR}/${_dir}/`machine` fi - BOOT_KERNEL=`( \ - 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#/}" + KERNEL_ROOT="" + [ -z "$BOOT_DEVICE" ] && set_boot_device - BOOT_KERNEL_VERSION=`kernel_file_version $BOOT_KERNEL` + mount_boot_device + cd $KERNEL_ROOT + BOOT_KERNEL=$( find_boot_kernel ) + BOOT_KERNEL_VERSION=$( kernel_file_version $BOOT_KERNEL ) + kernel_is_multiprocessor $BOOT_KERNEL && BOOT_KERNEL=bsd.mp + cd $OLDPWD + umount_boot_device BOOTED_KERNEL_VERSION=`sysctl -n kern.version` NEW_KERNEL_VERSION="" # 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 [ X"$INSTALL_KERNELS" == X"bsd.sp" ]; then INSTALL_KERNELS="bsd" @@ -322,18 +369,20 @@ local _missing_sets local _v=$FILE_VER + mount_boot_device for _n in $INSTALL_KERNELS; do local _o=$_n - [ X"bsd" == X"${_o}" -a -e /bsd.sp ] && _o=bsd.sp - if [ -e /${_o} -a ! -e ./${_n} ]; then - echo ${_o} does not exist + [ X"bsd" == X"${_o}" -a -e ${KERNEL_ROOT}bsd.sp ] && _o=bsd.sp + if [ -e ${KERNEL_ROOT}${_o} -a ! -e ./${_n} ]; then + echo ${_o} does not exist on $BOOT_DEVICE _missing_sets=1 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}` fi done + umount_boot_device if [ X"$NEW_KERNEL_VERSION" == X"" ]; then echo Missing replacement for boot kernel $BOOT_KERNEL >&2 @@ -371,26 +420,25 @@ install_kernels() { local _d=$1 - local default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' ) + local default_mount local boot_mount local mount_is_msdos if [ ! "$_d" ]; then - boot_mount=$( mount | - sed -ne "s!^$BOOT_PARTITION on \([^ ]*\).*!\1!p" ) + default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' ) + mount_boot_device - local _ik="$INSTALL_KERNELS" - INSTALL_KERNELS="${BOOT_KERNEL#/} bsd.rd" + if [ "$KERNEL_ROOT" != "$default_mount" ]; then + 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/ + install_kernels $KERNEL_ROOT + + INSTALL_KERNELS="$_ik" fi - INSTALL_KERNELS="$_ik" + umount_boot_device + install_kernels $default_mount return fi @@ -402,7 +450,7 @@ exit 1 fi - mount | grep -q " ${_d%/} .* msdos" && mount_is_msdos=1 + [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1 if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then echo "===> Backing up $BOOT_KERNEL to ${_d}obsd" @@ -567,7 +615,6 @@ export PKG_PATH TRUSTED_PKG_PATH set_version -[ -z "$BOOT_PARTITION" ] && set_boot_partition TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all} if [ "$FORCE_DIR" = "No" ]; then @@ -592,7 +639,7 @@ echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH" echo " RELEASEDIR: $RELEASEDIR" echo " DESTDIR: $DESTDIR" -echo " BOOT_PARTITION: $BOOT_PARTITION" +echo " BOOT_DEVICE: $BOOT_DEVICE" echo " BOOT_KERNEL: $BOOT_KERNEL" echo " INSTALL_KERNELS: $INSTALL_KERNELS" echo " INSTALLED_SETS: $INSTALLED_SETS" @@ -602,12 +649,14 @@ #echo " FILE_VER: $FILE_VER" echo +mount_boot_device for k in $INSTALL_KERNELS; do - if [ -e "/$k" ]; then - echo "Existing $k" - kernel_file_version "/$k" + if [ -e $KERNEL_ROOT$k ]; then + echo "Existing $BOOT_DEVICE:$k" + kernel_file_version $KERNEL_ROOT$k fi done +umount_boot_device if [ ${_error} -ne 0 ]; then exit ${_error}