version 1.114, 2018/12/16 20:49:58 |
version 1.125, 2019/04/23 23:38:48 |
|
|
#!/bin/sh |
#!/bin/sh |
# $AFresh1: update_openbsd,v 1.113 2018/12/16 20:31:06 andrew Exp $ |
# $AFresh1: update_openbsd,v 1.124 2019/03/31 21:10:01 andrew Exp $ |
# |
# |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# |
# |
|
|
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=${FORCE_DIR} |
_dir=${FORCE_DIR} |
elif sysctl kern.version | grep -q -- '-current '; then |
elif sysctl kern.version | grep -q -e '-current ' -e '-beta '; then |
_dir=snapshots |
_dir=snapshots |
FORCE_DIR=snapshots |
FORCE_DIR=snapshots |
else |
else |
|
|
fi |
fi |
|
|
cd $KERNEL_ROOT |
cd $KERNEL_ROOT |
BOOT_KERNEL=$( find_boot_kernel ) |
BOOTED_KERNEL=$( find_boot_kernel ) |
BOOT_KERNEL_VERSION=$( kernel_file_version $BOOT_KERNEL ) |
BOOT_KERNEL_VERSION=$( kernel_file_version $BOOTED_KERNEL ) |
if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOT_KERNEL; then |
|
|
if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOTED_KERNEL; then |
BOOT_KERNEL=bsd.mp |
BOOT_KERNEL=bsd.mp |
|
else |
|
BOOT_KERNEL=$BOOTED_KERNEL |
fi |
fi |
|
|
BOOTED_KERNEL_VERSION=`sysctl -n kern.version` |
BOOTED_KERNEL_VERSION=`sysctl -n kern.version` |
|
|
[ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1 |
[ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1 |
|
|
if [ "$EFI_BOOT" -a -d /mnt/efi/boot ]; then |
if [ "$EFI_BOOT" -a -d /mnt/efi/boot ]; then |
echo "Copying $EFI_BOOT to /mnt/efi/boot/$EFI_BOOT" |
echo "Copying $EFI_BOOT to /mnt/efi/boot/" |
cp "$EFI_BOOT" "/mnt/efi/boot/" |
( cd /mnt/efi/boot \ |
|
&& cp "$RELEASEDIR/$EFI_BOOT" "n$EFI_BOOT" \ |
|
&& mv "n$EFI_BOOT" "$EFI_BOOT" |
|
) |
fi |
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 ${_d}obsd" |
echo "===> Backing up ${_d}$BOOTED_KERNEL to ${_d}obsd" |
if [ $mount_is_msdos ]; then |
if [ $mount_is_msdos ]; then |
cp ${_d}$BOOT_KERNEL ${_d}obsd |
cp ${_d}$BOOTED_KERNEL ${_d}obsd |
else |
else |
ln -f ${_d}$BOOT_KERNEL ${_d}obsd |
ln -f ${_d}$BOOTED_KERNEL ${_d}obsd |
fi |
fi |
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
echo "Error copying old kernel!" >&2 |
echo "Error copying old kernel!" >&2 |
|
|
. ${HOME}/.update_openbsdrc |
. ${HOME}/.update_openbsdrc |
fi |
fi |
|
|
|
if [ -z "$MIRROR" -a -e /etc/installurl ]; then |
|
MIRROR=$(head -1 /etc/installurl) |
|
fi |
MIRROR=${MIRROR:=http://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} |
|
|
|
|
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"; |
|
|
echo Removing /sbin/oreboot |
echo Removing /sbin/oreboot |
rm -f /sbin/oreboot |
rm -f /sbin/oreboot |
fi |
fi |
|
|
|
echo "===> Relinking to create unique kernel..." |
|
sha256 -h /var/db/kernel.SHA256 /bsd |
|
/usr/libexec/reorder_kernel |
|
|
update_etc |
update_etc |
|
|
OPENUP=$( which openup 2>/dev/null ) |
OPENUP=$( which openup 2>/dev/null ) |
|
|
echo "==> UPDATING WITH $OPENUP" |
echo "==> UPDATING WITH $OPENUP" |
$OPENUP |
$OPENUP |
else |
else |
|
if [ X"snapshots" != X"$FORCE_DIR" ]; then |
|
echo '==> RUNNING SYSPATCH' |
|
syspatch |
|
fi |
echo '==> UPDATING PACKAGES' |
echo '==> UPDATING PACKAGES' |
pkg_add -u |
pkg_add -u |
fi |
fi |