version 1.62, 2014/01/23 02:40:07 |
version 1.68, 2014/10/18 23:42:35 |
|
|
#!/bin/sh |
#!/bin/sh |
# $AFresh1: update_openbsd,v 1.61 2014/01/23 02:30:02 andrew Exp $ |
# $AFresh1: update_openbsd,v 1.67 2014/05/11 02:40:54 andrew Exp $ |
# |
# |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# |
# |
|
|
|
|
installed_sets() { |
installed_sets() { |
local misc=/usr/share/doc/README |
local misc=/usr/share/doc/README |
local man=/usr/share/man/cat1/intro.0 |
local man=/usr/share/man/man1/intro.1 |
local comp=/usr/bin/cc |
local comp=/usr/bin/cc |
local game=/usr/games/ |
local game=/usr/games/ |
local xbase=/usr/X11R6/ |
local xbase=/usr/X11R6/ |
|
|
fi |
fi |
|
|
if [ X"" == X"${_v}" ]; then |
if [ X"" == X"${_v}" ]; then |
echo ERROR: Unable to determine file version! >&2 |
if [ X"" == X"${MIRROR}" ]; then |
|
echo ERROR: No sets, and no MIRROR, unable to continue. >&2 |
|
else |
|
echo ERROR: Unable to determine FILE_VER, check your MIRROR. >&2 |
|
fi |
return 1 |
return 1 |
fi |
fi |
|
|
|
|
|
|
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/${_nv}base.pub |
local _keyfile=/etc/signify/openbsd-${_nv}-base.pub |
local _b _s |
local _b _s |
|
|
( |
( |
|
|
echo "key [$_keyfile] does not exist, cannot check $_type" >&2 |
echo "key [$_keyfile] does not exist, cannot check $_type" >&2 |
return 2 |
return 2 |
fi |
fi |
signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sum -c - |
signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sha256 -c - |
else |
else |
grep -f index $_type | sum -c |
grep -f index $_type | sum -c |
fi |
fi |
|
|
|
|
install_kernels() { |
install_kernels() { |
echo '==> INSTALLING KERNEL' |
echo '==> INSTALLING KERNEL' |
if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then |
|
echo ${0##*/} must be run as root or SUDO must be set! >&2 |
|
exit 1 |
|
fi |
|
|
|
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 |
|
|
|
|
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 /obsd" |
$SUDO ln -f $BOOT_KERNEL /obsd |
ln -f $BOOT_KERNEL /obsd |
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 |
$SUDO rm -f /nbsd |
rm -f /nbsd |
local _bd=$_b |
local _bd=$_b |
[ X"${_b}" == X"bsd" ] && _bd="bsd.sp" |
[ X"${_b}" == X"bsd" ] && _bd="bsd.sp" |
|
|
|
|
[ 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" |
$SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_bd} |
cp ${_b} /nbsd && mv /nbsd /${_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 |
|
|
[ 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" |
echo "===> symlinking $_b to /bsd" |
$SUDO ln -sf $_b bsd |
ln -sf $_b bsd |
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
echo ERROR: Could not symlink new kernel! >&2 |
echo ERROR: Could not symlink new kernel! >&2 |
exit 1 |
exit 1 |
|
|
|
|
install_sets() { |
install_sets() { |
echo '==> INSTALLING SETS' |
echo '==> INSTALLING SETS' |
if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then |
|
echo ${0##*/} must be run as root or SUDO must be set! >&2 |
|
exit 1 |
|
fi |
|
|
|
if [ X"" == X"$RELEASEDIR" ]; then |
if [ X"" == X"$RELEASEDIR" ]; then |
echo ERROR: no source for sets! >&2 |
echo ERROR: no source for sets! >&2 |
|
|
fi |
fi |
|
|
echo "===> Extracting $_f to $_path" |
echo "===> Extracting $_f to $_path" |
$SUDO mkdir -p $_path |
mkdir -p $_path |
$SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f} |
tar -C $_path -xzphf ${RELEASEDIR}/${_f} |
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
echo ERROR: Could not extract ${_f}! >&2 |
echo ERROR: Could not extract ${_f}! >&2 |
exit 1 |
exit 1 |
|
|
fi |
fi |
if [ -e ${RELEASEDIR}/sendmail-smtp_auth ]; then |
if [ -e ${RELEASEDIR}/sendmail-smtp_auth ]; then |
if ! pkg_info -qe 'cyrus-sasl-*'; then |
if ! pkg_info -qe 'cyrus-sasl-*'; then |
$SUDO pkg_add -i cyrus-sasl |
pkg_add -i cyrus-sasl |
fi |
fi |
|
|
$SUDO install -o root -g smmsp -m 2555 \ |
install -o root -g smmsp -m 2555 \ |
${RELEASEDIR}/sendmail-smtp_auth \ |
${RELEASEDIR}/sendmail-smtp_auth \ |
/usr/libexec/sendmail/sendmail |
/usr/libexec/sendmail/sendmail |
|
|
|
|
exit 1; |
exit 1; |
fi |
fi |
|
|
if [ X"" == X"$RELEASEDIR" ]; then |
|
echo "ERROR: no source for etc!" >&2 |
|
exit 1 |
|
fi |
|
|
|
cd $RELEASEDIR |
|
|
|
local _v=$FILE_VER |
local _v=$FILE_VER |
local _args="" |
local _args="" |
if [ -e etc${_v}.tgz ]; then |
|
_args="$_args -s ${RELEASEDIR}/etc${_v}.tgz" |
if [ ! -e /usr/share/sysmerge/etc.tgz ]; then |
|
if [ X"" == X"$RELEASEDIR" ]; then |
|
echo "ERROR: no source for etc!" >&2 |
|
exit 1 |
|
fi |
|
|
|
cd $RELEASEDIR |
|
|
|
if [ -e etc${_v}.tgz ]; then |
|
_args="$_args -s ${RELEASEDIR}/etc${_v}.tgz" |
|
fi |
|
if [ -e xetc${_v}.tgz ]; then |
|
_args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz" |
|
fi |
|
if [ X"" == X"$_args" ]; then |
|
echo ERROR: No upgrade sets found! >&2 |
|
exit 1 |
|
fi |
fi |
fi |
if [ -e xetc${_v}.tgz ]; then |
|
_args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz" |
|
fi |
|
if [ X"" == X"$_args" ]; then |
|
echo ERROR: No upgrade sets found! >&2 |
|
else |
|
echo '==> RUNNING SYSMERGE' |
|
$SUDO $SYSMERGE $_args |
|
fi |
|
|
|
|
echo '==> RUNNING SYSMERGE' |
|
$SYSMERGE $_args |
|
|
cd $OLDPWD |
cd $OLDPWD |
} |
} |
|
|
|
|
|
if [ $(id -u) != 0 ]; then |
|
echo 'ERROR: need root privileges to run this script' >&2 |
|
exit 1 |
|
fi |
|
|
if [ -e /etc/update_openbsd.conf ]; then |
if [ -e /etc/update_openbsd.conf ]; then |
. /etc/update_openbsd.conf |
. /etc/update_openbsd.conf |
fi |
fi |
|
|
echo "-= update_openbsd - helper script to update OpenBSD =-" |
echo "-= update_openbsd - helper script to update OpenBSD =-" |
echo "------------------------------------------------------" |
echo "------------------------------------------------------" |
echo |
echo |
echo " SUDO: $SUDO" |
|
echo " SYSMERGE: $SYSMERGE" |
echo " SYSMERGE: $SYSMERGE" |
echo " MIRROR: $MIRROR" |
echo " MIRROR: $MIRROR" |
echo " RELEASEDIR: $RELEASEDIR" |
echo " RELEASEDIR: $RELEASEDIR" |
|
|
NEW_KERNEL_VERSION=$BOOT_KERNEL_VERSION |
NEW_KERNEL_VERSION=$BOOT_KERNEL_VERSION |
fi |
fi |
|
|
if [ -n "$SUDO" -a $CUR_VER != $NEW_VER ]; then |
if [ X"$NEW_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" ]; then |
echo >&2 |
echo >&2 |
echo "!!! You are upgrading between OpenBSD versions. !!!" >&2 |
echo "!!! You are upgrading the OpenBSD kernel. !!!" >&2 |
echo "!!! You should make sure you have a root shell open !!!" >&2 |
echo "!!! You will be given the opportunity to reboot !!!" >&2 |
echo "!!! It is needed in order to run /sbin/oreboot. !!!" >&2 |
echo "!!! at the end of the proces but it is safer to !!!" >&2 |
echo "!!! sudo MAY NOT WORK after sets are extracted. !!!" >&2 |
echo "!!! have a separate root shell open. !!!" >&2 |
|
echo "!!! It is needed in order to run /sbin/oreboot. !!!" >&2 |
|
echo "!!! sudo MAY NOT WORK after sets are extracted. !!!" >&2 |
echo >&2 |
echo >&2 |
echo "ctrl+C to cancel, enter to continue" >&2 |
echo "enter to continue, ctrl+C to cancel" >&2 |
local _temp |
local _temp |
read _temp |
read _temp |
fi |
|
|
|
if [ -n "$SUDO" ]; then |
if [ ! -e /sbin/oreboot ]; then |
echo |
cp /sbin/reboot /sbin/oreboot |
echo You may be asked for your sudo password multiple times. |
if [ $? -ne 0 ]; then |
$SUDO -v -p "sudo Password: " |
echo "Error copying old reboot command!" >&2 |
fi |
exit 1 |
|
fi |
if [ X"$NEW_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \ |
echo "/sbin/reboot copied to /sbin/oreboot" |
-a ! -e /sbin/oreboot ]; then |
|
$SUDO cp /sbin/reboot /sbin/oreboot |
|
if [ $? -ne 0 ]; then |
|
echo "Error copying old reboot command!" >&2 |
|
exit 1 |
|
fi |
fi |
echo "/sbin/reboot copied to /sbin/oreboot" |
|
fi |
fi |
|
|
install_kernels |
install_kernels |
|
|
|
|
if [ -e /sbin/oreboot ]; then |
if [ -e /sbin/oreboot ]; then |
echo Removing /sbin/oreboot |
echo Removing /sbin/oreboot |
$SUDO rm -f /sbin/oreboot |
$rm -f /sbin/oreboot |
fi |
fi |
update_etc |
update_etc |
|
|
echo '==> UPDATING PACKAGES' |
echo '==> UPDATING PACKAGES' |
$SUDO pkg_add -ui -F update -F updatedepends |
pkg_add -ui -F update -F updatedepends |
|
|
else |
else |
echo Instructions for updating to the new version available from |
echo Instructions for updating to the new version available from |
|
|
fi |
fi |
fi |
fi |
|
|
echo New kernel installed. Please reboot! |
echo Update complete. enter to reboot, ctrl+C to cancel |
|
read _temp |
if [ -e /sbin/oreboot ]; then |
if [ -e /sbin/oreboot ]; then |
echo Possibly using /sbin/oreboot |
echo using /sbin/oreboot |
|
/sbin/oreboot |
|
else |
|
/sbin/reboot |
fi |
fi |