version 1.95, 2017/12/10 21:19:11 |
version 1.118, 2018/12/16 21:10:00 |
|
|
#!/bin/sh |
#!/bin/sh |
# $AFresh1: update_openbsd,v 1.94 2017/12/10 21:16:05 andrew Exp $ |
# $AFresh1: update_openbsd,v 1.117 2018/12/16 20:57:49 andrew Exp $ |
# |
# |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# |
# |
|
|
#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 -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() { |
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"` |
|
|
|
|
local _cv=`echo $CUR_VER | sed -e 's/\.//'` |
local _cv=`echo $CUR_VER | sed -e 's/\.//'` |
local _nv=`echo $NEW_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 |
if [ X"No" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then |
_dir=$FORCE_DIR |
_dir=$FORCE_DIR |
|
|
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 |
|
|
|
# _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` |
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" |
fi |
fi |
# with a second option of an mp kernel if is is a likely candidate |
|
if [ X"$INSTALL_KERNELS" != X"bsd.mp" ]; then |
# We want to update all kernels that exist |
local _ncpu=$(sysctl -n hw.ncpufound) |
# either in the $KERNEL_ROOT or in / |
[ $_ncpu -gt 1 ] && INSTALL_KERNELS="$INSTALL_KERNELS bsd.mp" |
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 |
fi |
# or just bsd otherwise |
|
if [ X"${INSTALL_KERNELS% *}" != X"bsd" ]; then |
umount_boot_device |
INSTALL_KERNELS="$INSTALL_KERNELS bsd" |
|
fi |
|
BOOT_KERNELS=$INSTALL_KERNELS |
BOOT_KERNELS=$INSTALL_KERNELS |
INSTALL_KERNELS="$INSTALL_KERNELS bsd.rd" |
INSTALL_KERNELS="$INSTALL_KERNELS bsd.rd" |
} |
} |
|
|
|
|
local _v=$FILE_VER |
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 |
for _b in $INSTALL_KERNELS; do |
if [ ! -e ./${_b} ]; then |
if [ ! -e ./${_b} ]; then |
echo "===> $FTP_CMD ${FTP}/${_b}" |
echo "===> $FTP_CMD ${FTP}/${_b}" |
|
|
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 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 |
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 != / ] && _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 |
if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then |
echo "===> Backing up $BOOT_KERNEL to /obsd" |
echo "===> Backing up ${_d}$BOOTED_KERNEL to ${_d}obsd" |
ln -f $BOOT_KERNEL /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 |
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 |
} |
} |
|
|
|
|
. ${HOME}/.update_openbsdrc |
. ${HOME}/.update_openbsdrc |
fi |
fi |
|
|
MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD} |
MIRROR=${MIRROR:=http://cdn.openbsd.org/pub/OpenBSD} |
FTP_CMD=${FTP_CMD:=ftp -V} |
FTP_CMD=${FTP_CMD:=ftp -V} |
|
|
DESTDIR=${DESTDIR:=/} |
DESTDIR=${DESTDIR:=/} |
|
|
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" |
|
[ "$EFI_BOOT" ] && echo " EFI_BOOT: $EFI_BOOT" |
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 |
|
l=$KERNEL_ROOT |
|
[ "$l" = / ] || l="$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 $l$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 "===> Last booted:\n$BOOTED_KERNEL_VERSION" |
echo "===> Last booted:\n$BOOTED_KERNEL_VERSION" |
if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \ |
if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \ |
-a X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then |
-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 |
fi |
if [ -n "$NEW_KERNEL_VERSION" ]; then |
if [ -n "$NEW_KERNEL_VERSION" ]; then |
echo "===> New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION"; |
echo "===> New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION"; |