version 1.87, 2017/11/28 02:52:31 |
version 1.105, 2017/12/11 02:58:57 |
|
|
#!/bin/sh |
#!/bin/sh |
# $AFresh1: update_openbsd,v 1.86 2017/03/01 03:22:51 andrew Exp $ |
# $AFresh1: update_openbsd,v 1.103 2017/12/11 02:50:09 andrew Exp $ |
# |
# |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# |
# |
# Permission to use, copy, modify, and distribute this software for any |
# Permission to use, copy, modify, and distribute this software for any |
|
|
done |
done |
|
|
sendmail -d0.1 --badoption </dev/null 2>/dev/null | grep -q SASL |
sendmail -d0.1 --badoption </dev/null 2>/dev/null | grep -q SASL |
if [ $? == 0 ]; then |
if [ $? == 0 ]; then |
echo -n ' sendmail-smtp_auth' |
echo -n ' sendmail-smtp_auth' |
fi |
fi |
} |
} |
|
|
#what $1 | sed -ne 's/[[:blank:]]\{1,\}//p' |
#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() { |
version_in() { |
local _proto=${FTP%%://*} |
local _proto=${FTP%%://*} |
local _file |
local _file |
|
|
_file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'` |
_file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'` |
|
|
elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then |
elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then |
local _list=`${FTP_CMD} -V -o - ${FTP}/` |
_file=`${FTP_CMD} -V -o - ${FTP}/index.txt | |
_file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ { |
sed -ne 's/.*\(base[0-9][0-9].tgz\).*/\1/p'` |
sub("^.*base","base"); |
|
sub("\.tgz.*",".tgz"); |
|
print $0; |
|
}'` |
|
|
|
elif [ X"scp" == X"${_proto}" ]; then |
elif [ X"scp" == X"${_proto}" ]; then |
echo SCP is not yet supported >&2 |
echo SCP is not yet supported >&2 |
return 2 |
return 2 |
|
|
else |
else |
echo Unsupported FTP ${FTP} >&2 |
echo Unsupported FTP ${FTP} >&2 |
return 2 |
return 2 |
|
|
|
|
echo $_v |
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() { |
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"` |
|
|
fi |
fi |
|
|
if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then |
if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then |
if [ X"No" == X"${FORCE_DIR}" ]; then |
if [ X"No" != X"${FORCE_DIR}" ]; then |
_dir=${NEW_VER} |
|
else |
|
_dir=${FORCE_DIR} |
_dir=${FORCE_DIR} |
|
elif sysctl kern.version | grep -q -- '-current '; then |
|
_dir=snapshots |
|
FORCE_DIR=snapshots |
|
else |
|
_dir=${NEW_VER} |
fi |
fi |
FTP=${MIRROR}/${_dir}/`machine` |
FTP=${MIRROR}/${_dir}/`machine` |
|
|
|
|
|
|
if [ X"" == X"${_v}" ]; then |
if [ X"" == X"${_v}" ]; then |
echo No sets in [${FTP}] >&2 |
echo No sets in [${FTP}] >&2 |
return 2 |
return 2 |
elif [ X"${_cv}" == X"${_v}" ]; then |
elif [ X"${_cv}" == X"${_v}" ]; then |
NEW_VER=$CUR_VER |
NEW_VER=$CUR_VER |
elif [ X"${_nv}" == X"${_v}" ]; then |
elif [ X"${_nv}" == X"${_v}" ]; then |
|
|
FTP=${MIRROR}/${_dir}/`machine` |
FTP=${MIRROR}/${_dir}/`machine` |
fi |
fi |
|
|
BOOT_KERNEL=`( \ |
KERNEL_ROOT="" |
echo bsd; \ |
[ -z "$BOOT_DEVICE" ] && set_boot_device |
[ -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#/}" |
|
|
|
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` |
BOOTED_KERNEL_VERSION=`sysctl -n kern.version` |
NEW_KERNEL_VERSION="" |
NEW_KERNEL_VERSION="" |
|
|
# We want to default to what we had |
# 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 the boot kernel was our specially named bsd.sp, we install from bsd |
if [ X"$INSTALL_KERNELS" == X"bsd.sp" ]; then |
if [ X"$INSTALL_KERNELS" == X"bsd.sp" ]; then |
INSTALL_KERNELS="bsd" |
INSTALL_KERNELS="bsd" |
|
|
|
|
local _nv=`echo $NEW_VER | sed -e 's/\.//'` |
local _nv=`echo $NEW_VER | sed -e 's/\.//'` |
local _signify=`which signify 2>/dev/null` |
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 |
local _b _s |
|
|
( |
( |
for _b in $INSTALL_KERNELS; do echo "($_b)" ; done |
for _b in $INSTALL_KERNELS; do echo "($_b)" ; done |
for _s in $INSTALLED_SETS; do echo "($_s$_nv.tgz)"; done |
for _s in $INSTALLED_SETS; do echo "($_s$_nv.tgz)"; done |
) > index |
) > index |
|
|
|
|
|
|
if [ -n "$_signify" -a "$_type" != "${_type%.sig}" ]; then |
if [ -n "$_signify" -a "$_type" != "${_type%.sig}" ]; then |
echo "===> Checking signature"; |
echo "===> Checking signature"; |
if [ ! -e $_keyfile ]; then |
if [ ! -e $_keyfile ]; then |
|
|
local _missing_sets |
local _missing_sets |
local _v=$FILE_VER |
local _v=$FILE_VER |
|
|
|
mount_boot_device |
for _n in $INSTALL_KERNELS; do |
for _n in $INSTALL_KERNELS; do |
local _o=$_n |
local _o=$_n |
[ X"bsd" == X"${_o}" -a -e /bsd.sp ] && _o=bsd.sp |
[ X"bsd" == X"${_o}" -a -e ${KERNEL_ROOT}bsd.sp ] && _o=bsd.sp |
if [ -e /${_o} -a ! -e ./${_n} ]; then |
if [ -e ${KERNEL_ROOT}${_o} -a ! -e ./${_n} ]; then |
echo ${_o} does not exist |
echo ${_o} does not exist on $BOOT_DEVICE |
_missing_sets=1 |
_missing_sets=1 |
fi |
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}` |
NEW_KERNEL_VERSION=`kernel_file_version ./${_n}` |
fi |
fi |
done |
done |
|
umount_boot_device |
|
|
if [ X"$NEW_KERNEL_VERSION" == X"" ]; then |
if [ X"$NEW_KERNEL_VERSION" == X"" ]; then |
echo Missing replacement for boot kernel $BOOT_KERNEL >&2 |
echo Missing replacement for boot kernel $BOOT_KERNEL >&2 |
|
|
|
|
|
|
install_kernels() { |
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 |
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 |
|
|
|
[ $_d != / ] && mount | grep -q " on ${_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 |
|
|
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 |
|
|
|
|
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 |
} |
} |
|
|
|
|
if [ -e xetc${_v}.tgz ]; then |
if [ -e xetc${_v}.tgz ]; then |
_args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz" |
_args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz" |
fi |
fi |
if [ X"" == X"$_args" ]; then |
if [ X"" == X"$_args" ]; then |
echo ERROR: No upgrade sets found! >&2 |
echo ERROR: No upgrade sets found! >&2 |
exit 1 |
exit 1 |
fi |
fi |
|
|
. ${HOME}/.update_openbsdrc |
. ${HOME}/.update_openbsdrc |
fi |
fi |
|
|
#MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD} |
MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD} |
FTP_CMD=${FTP_CMD:=ftp -V} |
FTP_CMD=${FTP_CMD:=ftp -V} |
PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/} |
|
|
|
DESTDIR=${DESTDIR:=/} |
DESTDIR=${DESTDIR:=/} |
SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} |
SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} |
|
|
|
|
set_version |
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`} |
INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`} |
|
|
CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256} |
CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256} |
|
|
echo "------------------------------------------------------" |
echo "------------------------------------------------------" |
echo |
echo |
echo " SYSMERGE: $SYSMERGE" |
echo " SYSMERGE: $SYSMERGE" |
echo " MIRROR: $MIRROR" |
echo " MIRROR: $FTP" |
echo " PKG_PATH: $PKG_PATH" |
echo " PKG_PATH: $PKG_PATH" |
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_DEVICE: $BOOT_DEVICE" |
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" |
|
|
#echo " FILE_VER: $FILE_VER" |
#echo " FILE_VER: $FILE_VER" |
echo |
echo |
|
|
|
mount_boot_device |
for k in $INSTALL_KERNELS; do |
for k in $INSTALL_KERNELS; do |
if [ -e "/$k" ]; then |
if [ -e $KERNEL_ROOT$k ]; then |
echo "Existing $k" |
echo "Existing $BOOT_DEVICE:$k" |
kernel_file_version "/$k" |
kernel_file_version $KERNEL_ROOT$k |
fi |
fi |
done |
done |
|
umount_boot_device |
|
|
if [ ${_error} -ne 0 ]; then |
if [ ${_error} -ne 0 ]; then |
exit ${_error} |
exit ${_error} |
|
|
echo >&2 |
echo >&2 |
echo "!!! You are upgrading the OpenBSD kernel. !!!" >&2 |
echo "!!! You are upgrading the OpenBSD kernel. !!!" >&2 |
echo "!!! You will be given the opportunity to reboot !!!" >&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 "!!! have a separate root shell open. !!!" >&2 |
echo "!!! It is needed in order to run /sbin/oreboot. !!!" >&2 |
echo "!!! It is needed in order to run /sbin/oreboot. !!!" >&2 |
echo "!!! doas MAY NOT WORK after sets are extracted. !!!" >&2 |
echo "!!! doas MAY NOT WORK after sets are extracted. !!!" >&2 |
|
|
echo "$SYSMERGE -b" >>/etc/rc.sysmerge && |
echo "$SYSMERGE -b" >>/etc/rc.sysmerge && |
echo "==> RUNNING $SYSMERGE -b ON REBOOT" |
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 |
if [ X"snapshots" == X"$FORCE_DIR" ]; then |
echo " http://www.openbsd.org/faq/current.html" |
echo " http://www.openbsd.org/faq/current.html" |
else |
else |