version 1.87, 2017/11/28 02:52:31 |
version 1.95, 2017/12/10 21:19:11 |
|
|
#!/bin/sh |
#!/bin/sh |
# $AFresh1: update_openbsd,v 1.86 2017/03/01 03:22:51 andrew Exp $ |
# $AFresh1: update_openbsd,v 1.94 2017/12/10 21:16:05 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 |
} |
} |
|
|
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 |
|
|
|
|
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 _is_boot="" |
local _is_boot="" |
[ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel" |
[ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel" |
|
|
echo "Copying $_b to /$_bd $_is_boot" |
echo "Copying $_b to /$_bd $_is_boot" |
cp ${_b} /nbsd && mv /nbsd /${_bd} |
cp ${_b} /nbsd && mv /nbsd /${_bd} |
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
|
|
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 >&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 |