=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.88 retrieving revision 1.119 diff -u -r1.88 -r1.119 --- openbsd/update_openbsd/update_openbsd 2017/11/28 02:54:34 1.88 +++ openbsd/update_openbsd/update_openbsd 2018/12/16 23:42:07 1.119 @@ -1,6 +1,6 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.87 2017/11/28 02:52:31 andrew Exp $ -# +# $AFresh1: update_openbsd,v 1.118 2018/12/16 21:10:00 andrew Exp $ +# # Copyright (c) 2012 Andrew Fresh # # Permission to use, copy, modify, and distribute this software for any @@ -42,7 +42,7 @@ done sendmail -d0.1 --badoption /dev/null | grep -q SASL - if [ $? == 0 ]; then + if [ $? == 0 ]; then echo -n ' sendmail-smtp_auth' fi } @@ -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 @@ -61,18 +65,14 @@ _file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'` elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then - local _list=`${FTP_CMD} -V -o - ${FTP}/` - _file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ { - sub("^.*base","base"); - sub("\.tgz.*",".tgz"); - print $0; - }'` + _file=`${FTP_CMD} -V -o - ${FTP}/index.txt | + sed -ne 's/.*\(base[0-9][0-9].tgz\).*/\1/p'` elif [ X"scp" == X"${_proto}" ]; then echo SCP is not yet supported >&2 return 2 - else + else echo Unsupported FTP ${FTP} >&2 return 2 @@ -83,6 +83,58 @@ echo $_v } +set_boot_device() { + BOOT_DEVICE=$( df -lnP /bsd | sed -ne 's! .*/$!!p' ) + + root_disk=$( echo $BOOT_DEVICE | + 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_DEVICE="/dev/$root_disk$msdos_partition" +} + +boot_device_mounted="" +mount_boot_device() { + [ "$boot_device_mounted" ] && return + [ "$BOOT_DEVICE" ] || return + + local boot_mount=$( mount | + sed -ne "s!^$BOOT_DEVICE on \([^ ]*\).*!\1!p" ) + + if [ ! "$boot_mount" ]; then + mount $BOOT_DEVICE /mnt + boot_device_mounted=1 + 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"` @@ -91,7 +143,7 @@ local _cv=`echo $CUR_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 _dir=$FORCE_DIR @@ -118,10 +170,13 @@ fi if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then - if [ X"No" == X"${FORCE_DIR}" ]; then - _dir=${NEW_VER} - else + if [ X"No" != X"${FORCE_DIR}" ]; then _dir=${FORCE_DIR} + elif sysctl kern.version | grep -q -- '-current '; then + _dir=snapshots + FORCE_DIR=snapshots + else + _dir=${NEW_VER} fi FTP=${MIRROR}/${_dir}/`machine` @@ -142,7 +197,7 @@ if [ X"" == X"${_v}" ]; then echo No sets in [${FTP}] >&2 - return 2 + return 2 elif [ X"${_cv}" == X"${_v}" ]; then NEW_VER=$CUR_VER elif [ X"${_nv}" == X"${_v}" ]; then @@ -176,34 +231,65 @@ 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 + # _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` 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" fi - # with a second option of an mp kernel if is is a likely candidate - if [ X"$INSTALL_KERNELS" != X"bsd.mp" ]; then - local _ncpu=$(sysctl -n hw.ncpufound) - [ $_ncpu -gt 1 ] && INSTALL_KERNELS="$INSTALL_KERNELS bsd.mp" + + # We want to update all kernels that exist + # either in the $KERNEL_ROOT or in / + 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 - # or just bsd otherwise - if [ X"${INSTALL_KERNELS% *}" != X"bsd" ]; then - INSTALL_KERNELS="$INSTALL_KERNELS bsd" - fi + + umount_boot_device + BOOT_KERNELS=$INSTALL_KERNELS INSTALL_KERNELS="$INSTALL_KERNELS bsd.rd" } @@ -220,6 +306,16 @@ 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 if [ ! -e ./${_b} ]; then echo "===> $FTP_CMD ${FTP}/${_b}" @@ -275,15 +371,15 @@ local _nv=`echo $NEW_VER | sed -e 's/\.//'` local _signify=`which signify 2>/dev/null` - local _keyfile=/etc/signify/openbsd-${_nv}-base.pub + local _keyfile=/etc/signify/openbsd-${_nv}-base.pub local _b _s ( for _b in $INSTALL_KERNELS; do echo "($_b)" ; done for _s in $INSTALLED_SETS; do echo "($_s$_nv.tgz)"; done ) > index - + if [ -n "$_signify" -a "$_type" != "${_type%.sig}" ]; then echo "===> Checking signature"; if [ ! -e $_keyfile ]; then @@ -308,18 +404,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 @@ -356,16 +454,55 @@ install_kernels() { - echo '==> INSTALLING KERNEL' + local _d="$1" + local boot_mount + local mount_is_msdos + if [ "$_d" ]; then + _d=$( readlink -nf "$_d" ) + else + mount_boot_device + + if [ "$KERNEL_ROOT" != "/" ]; then + local _ik="$INSTALL_KERNELS" + INSTALL_KERNELS="$BOOT_KERNEL bsd.rd" + + install_kernels $KERNEL_ROOT + + INSTALL_KERNELS="$_ik" + fi + + umount_boot_device + + install_kernels / + return + fi + + echo "==> INSTALLING KERNEL to $_d" + if [ X"" == X"$RELEASEDIR" ]; then echo ERROR: no source for new kernels! >&2 exit 1 fi + [ $_d != / ] && _d=${_d%/}/ + [ $_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 - echo "===> Backing up $BOOT_KERNEL to /obsd" - ln -f $BOOT_KERNEL /obsd + echo "===> Backing up ${_d}$BOOTED_KERNEL to ${_d}obsd" + if [ $mount_is_msdos ]; then + cp ${_d}$BOOTED_KERNEL ${_d}obsd + else + ln -f ${_d}$BOOTED_KERNEL ${_d}obsd + fi if [ $? -ne 0 ]; then echo "Error copying old kernel!" >&2 exit 1 @@ -375,15 +512,15 @@ cd $RELEASEDIR for _b in $INSTALL_KERNELS; do - rm -f /nbsd + rm -f ${_d}nbsd local _bd=$_b [ X"${_b}" == X"bsd" ] && _bd="bsd.sp" local _is_boot="" - [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel" - - echo "Copying $_b to /$_bd $_is_boot" - cp ${_b} /nbsd && mv /nbsd /${_bd} + [ X"$BOOT_KERNEL" == X"${_d}${_bd}" ] && _is_boot="# boot kernel" + + echo "Copying $_b to ${_d}$_bd $_is_boot" + cp ${_b} ${_d}nbsd && mv ${_d}nbsd ${_d}${_bd} if [ $? -ne 0 ]; then echo ERROR: Could not copy new $_bd kernel! >&2 exit 1 @@ -392,22 +529,26 @@ cd $OLDPWD - if [ ! -h /bsd ]; then - cd / + if [ ! -h ${_d}bsd ]; then + cd ${_d} for _b in $BOOT_KERNELS; do [ X"$_b" == X"bsd" ] && _b="bsd.sp" if [ -e $_b ]; then - echo "===> symlinking $_b to /bsd" - ln -sf $_b bsd - if [ $? -ne 0 ]; then - echo ERROR: Could not symlink new kernel! >&2 - exit 1 + if [ "$mount_is_msdos" ]; then + echo "===> Moving $_b ${_d}bsd (MSDOS)" + mv -f ${_b} bsd + else + echo "===> symlinking $_b to ${_d}bsd" + ln -sf $_b bsd fi break fi done - cd $OLDPWD + cd $OLDPWD fi + + echo "===> Updating /var/db/kernel.SHA256" + sha256 -h /var/db/kernel.SHA256 ${_d}/bsd } install_sets() { @@ -485,7 +626,7 @@ if [ -e xetc${_v}.tgz ]; then _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz" fi - if [ X"" == X"$_args" ]; then + if [ X"" == X"$_args" ]; then echo ERROR: No upgrade sets found! >&2 exit 1 fi @@ -511,9 +652,8 @@ . ${HOME}/.update_openbsdrc fi -#MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD} +MIRROR=${MIRROR:=http://cdn.openbsd.org/pub/OpenBSD} FTP_CMD=${FTP_CMD:=ftp -V} -PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/} DESTDIR=${DESTDIR:=/} SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} @@ -523,6 +663,13 @@ set_version +TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all} +if [ "$FORCE_DIR" = "No" ]; then + PKG_PATH=${PKG_PATH:=${MIRROR}/$NEW_VER/packages/`machine -a`} +else + PKG_PATH=${PKG_PATH:=${MIRROR}/$FORCE_DIR/packages/`machine -a`} +fi + INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`} CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256} @@ -539,6 +686,8 @@ echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH" echo " RELEASEDIR: $RELEASEDIR" echo " DESTDIR: $DESTDIR" +echo " BOOT_DEVICE: $BOOT_DEVICE" +[ "$EFI_BOOT" ] && echo " EFI_BOOT: $EFI_BOOT" echo " BOOT_KERNEL: $BOOT_KERNEL" echo " INSTALL_KERNELS: $INSTALL_KERNELS" echo " INSTALLED_SETS: $INSTALLED_SETS" @@ -548,12 +697,16 @@ #echo " FILE_VER: $FILE_VER" echo +mount_boot_device +l=$KERNEL_ROOT +[ "$l" = / ] || l="$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 $l$k" + kernel_file_version $KERNEL_ROOT$k fi done +umount_boot_device if [ ${_error} -ne 0 ]; then exit ${_error} @@ -568,7 +721,7 @@ echo "===> Last booted:\n$BOOTED_KERNEL_VERSION" if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \ -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 if [ -n "$NEW_KERNEL_VERSION" ]; then echo "===> New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION"; @@ -584,7 +737,7 @@ echo >&2 echo "!!! You are upgrading the OpenBSD kernel. !!!" >&2 echo "!!! You will be given the opportunity to reboot !!!" >&2 - echo "!!! at the end of the proces but it is safer to !!!" >&2 + echo "!!! at the end of the proces but it is safer to !!!" >&2 echo "!!! have a separate root shell open. !!!" >&2 echo "!!! It is needed in order to run /sbin/oreboot. !!!" >&2 echo "!!! doas MAY NOT WORK after sets are extracted. !!!" >&2 @@ -603,6 +756,11 @@ 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 + install_kernels install_sets @@ -632,7 +790,7 @@ echo "$SYSMERGE -b" >>/etc/rc.sysmerge && echo "==> RUNNING $SYSMERGE -b ON REBOOT" - echo Instructions for updating to the new version available from + echo Instructions for updating to the new version available from if [ X"snapshots" == X"$FORCE_DIR" ]; then echo " http://www.openbsd.org/faq/current.html" else