=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.82 retrieving revision 1.104 diff -u -r1.82 -r1.104 --- openbsd/update_openbsd/update_openbsd 2016/05/10 02:58:12 1.82 +++ openbsd/update_openbsd/update_openbsd 2017/12/11 02:53:13 1.104 @@ -1,6 +1,6 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.81 2015/11/27 22:39:14 andrew Exp $ -# +# $AFresh1: update_openbsd,v 1.103 2017/12/11 02:50:09 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 } @@ -60,19 +60,15 @@ local _list=`echo "ls base*.tgz" | ${FTP_CMD} ${FTP}/` _file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'` - elif [ X"http" == 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; - }'` + elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then + _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 +79,63 @@ echo $_v } +set_boot_device() { + BOOT_DEVICE=$( df -nP /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 + + 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"` @@ -118,10 +171,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 +198,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,21 +232,21 @@ 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 ) + 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" @@ -275,15 +331,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 +364,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 @@ -339,7 +397,7 @@ done if [ X"" == X"${_missing_sets}" ]; then - echo '===> All OK' + echo 'All OK' fi local _type @@ -356,16 +414,46 @@ install_kernels() { - echo '==> INSTALLING KERNEL' + local _d=$1 + local default_mount + local boot_mount + local mount_is_msdos + if [ ! "$_d" ]; then + default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' ) + mount_boot_device + + if [ "$KERNEL_ROOT" != "$default_mount" ]; then + local _ik="$INSTALL_KERNELS" + INSTALL_KERNELS="$BOOT_KERNEL bsd.rd" + + install_kernels $KERNEL_ROOT + + INSTALL_KERNELS="$_ik" + fi + + umount_boot_device + + install_kernels $default_mount + return + fi + + echo "==> INSTALLING KERNEL to $_d" + if [ X"" == X"$RELEASEDIR" ]; then echo ERROR: no source for new kernels! >&2 exit 1 fi + [ $_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 /obsd" - ln -f $BOOT_KERNEL /obsd + echo "===> Backing up $BOOT_KERNEL to ${_d}obsd" + if [ $mount_is_msdos ]; then + cp $BOOT_KERNEL ${_d}obsd + else + ln -f $BOOT_KERNEL ${_d}obsd + fi if [ $? -ne 0 ]; then echo "Error copying old kernel!" >&2 exit 1 @@ -375,15 +463,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,21 +480,22 @@ 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 } @@ -431,7 +520,7 @@ _path=/var/tmp/temproot fi - echo "===> Extracting $_f to $_path" + echo "Extracting $_f to $_path" mkdir -p $_path tar -C $_path -xzphf ${RELEASEDIR}/${_f} if [ $? -ne 0 ]; then @@ -485,7 +574,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,16 +600,24 @@ . ${HOME}/.update_openbsdrc fi -#MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD} +MIRROR=${MIRROR:=http://fastly.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} FORCE_DIR=${FORCE_DIR:=No} +export PKG_PATH TRUSTED_PKG_PATH + 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} @@ -531,25 +628,30 @@ echo "-= update_openbsd - helper script to update OpenBSD =-" echo "------------------------------------------------------" echo -echo " SYSMERGE: $SYSMERGE" -echo " MIRROR: $MIRROR" -echo " RELEASEDIR: $RELEASEDIR" -echo " DESTDIR: $DESTDIR" -echo " BOOT_KERNEL: $BOOT_KERNEL" -echo "INSTALL_KERNELS: $INSTALL_KERNELS" -echo " INSTALLED_SETS: $INSTALLED_SETS" +echo " SYSMERGE: $SYSMERGE" +echo " MIRROR: $FTP" +echo " PKG_PATH: $PKG_PATH" +echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH" +echo " RELEASEDIR: $RELEASEDIR" +echo " DESTDIR: $DESTDIR" +echo " BOOT_DEVICE: $BOOT_DEVICE" +echo " BOOT_KERNEL: $BOOT_KERNEL" +echo " INSTALL_KERNELS: $INSTALL_KERNELS" +echo " INSTALLED_SETS: $INSTALLED_SETS" echo -echo " CUR_VER: $CUR_VER" -echo " NEW_VER: $NEW_VER" -#echo " FILE_VER: $FILE_VER" +echo " CUR_VER: $CUR_VER" +echo " NEW_VER: $NEW_VER" +#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} @@ -580,7 +682,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 @@ -617,18 +719,18 @@ $OPENUP else echo '==> UPDATING PACKAGES' - pkg_add -ui -F update -F updatedepends + pkg_add -u fi echo '==> UPDATING FIRMWARE' fw_update else - grep -q $SYSMERGE /etc/rc.sysmerge || + [ -e /etc/rc.sysmerge ] && grep -q $SYSMERGE /etc/rc.sysmerge || 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