version 1.20, 2009/04/25 01:14:12 |
version 1.28, 2009/12/10 06:09:40 |
|
|
#!/bin/sh |
#!/bin/sh |
# $RedRiver: update_openbsd,v 1.19 2009/03/14 01:09:23 andrew Exp $ |
# $RedRiver: update_openbsd,v 1.27 2009/12/04 04:26:36 andrew Exp $ |
|
|
installed_sets() { |
installed_sets() { |
local misc=/usr/share/doc/README |
local misc=/usr/share/doc/README |
|
|
fi |
fi |
done |
done |
|
|
sendmail -d0.1 root < /dev/null | grep -q SASL |
sendmail -d0.1 -bt < /dev/null | grep -q SASL |
if [ $? == 0 ]; then |
if [ $? == 0 ]; then |
echo -n ' sendmail-smtp_auth' |
echo -n ' sendmail-smtp_auth' |
fi |
fi |
|
|
done |
done |
} |
} |
|
|
|
follow_symlink () { |
|
local _file=$1 |
|
local _next=$( file $_file | |
|
grep 'symbolic link' | |
|
sed -e s/^.*\\\`// -e s/\\\'\$// ) |
|
if [ -h $_next ]; then |
|
follow_symlink $_next |
|
else |
|
echo $_next |
|
fi |
|
} |
|
|
check_sum () { |
check_sum () { |
local _type=$1 |
local _type=$1 |
echo "### CHECKING $_type SUMS ###" |
echo "### CHECKING $_type SUMS ###" |
|
|
fi |
fi |
|
|
local _v=$FILE_VER |
local _v=$FILE_VER |
if [ -e base${_v}.tgz ]; then |
|
echo Extracting new firmware and ifconfig from base${_v}.tgz |
|
$SUDO tar -C $DESTDIR -xzphf base${_v}.tgz \ |
|
./etc/firmware ./sbin/ifconfig |
|
fi |
|
|
|
$SUDO rm -f /obsd |
$SUDO rm -f /obsd |
$SUDO ln /bsd /obsd |
$SUDO ln /bsd /obsd |
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
echo "Error copying old kernel!" |
echo "Error copying old kernel!" >&2 |
exit 1 |
exit 1 |
fi |
fi |
|
|
|
local _true_bsd=`follow_symlink /bsd` |
|
local _installed_new_bsd |
|
|
for _b in bsd*; do |
for _b in bsd*; do |
$SUDO rm -f /nbsd |
$SUDO rm -f /nbsd |
|
|
if [ X"${_b}" == X"bsd" ]; then |
if [ X"${_b}" == X"bsd" ]; then |
echo Copying bsd to /bsd.sp |
echo Copying bsd to /bsd.sp |
$SUDO cp bsd /nbsd && $SUDO mv /nbsd /bsd.sp |
$SUDO cp bsd /nbsd && $SUDO mv /nbsd /bsd.sp |
|
|
echo ERROR: Could not copy new SP kernel! >&2 |
echo ERROR: Could not copy new SP kernel! >&2 |
exit 1 |
exit 1 |
fi |
fi |
|
if [ X"${_true_bsd}" == X"/bsd.sp" ]; then |
|
_installed_new_bsd=1 |
|
fi |
else |
else |
if [ -e /$_b ]; then |
if [ -e /$_b ]; then |
echo Copying $_b to / |
echo Copying $_b to / |
|
|
echo ERROR: Could not copy new $_b kernel! >&2 |
echo ERROR: Could not copy new $_b kernel! >&2 |
exit 1 |
exit 1 |
fi |
fi |
|
if [ X"${_true_bsd}" == X"/${_b}" ]; then |
|
_installed_new_bsd=1 |
|
fi |
fi |
fi |
fi |
fi |
done |
done |
|
|
exit 1 |
exit 1 |
fi |
fi |
fi |
fi |
|
|
|
if [ -z $_installed_new_bsd ]; then |
|
echo WARNING: Did not replace $_true_bsd kernel >&2 |
|
fi |
} |
} |
|
|
install_sets() { |
install_sets() { |
|
|
|
|
local _v=$FILE_VER |
local _v=$FILE_VER |
|
|
for _f in *${_v}.tgz; do |
if [ $CUR_VER != $NEW_VER -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 |
|
echo "/sbin/reboot copied to /sbin/oreboot" |
|
fi |
|
|
|
local _sets=`ls *${_v}.tgz | grep -v ^base ` |
|
for _f in ${_sets} base${_v}.tgz; do |
_path=$DESTDIR |
_path=$DESTDIR |
if [ X"etc${_v}.tgz" == X"$_f" \ |
if [ X"etc${_v}.tgz" == X"$_f" \ |
-o X"xetc${_v}.tgz" == X"$_f" ]; then |
-o X"xetc${_v}.tgz" == X"$_f" ]; then |
if [ X"" != X"$SYSMERGE" ]; then |
[ X"" != X"$SYSMERGE" ] && continue |
continue |
|
fi |
|
_path=/var/tmp/temproot |
_path=/var/tmp/temproot |
fi |
fi |
|
|
|
|
${RELEASEDIR}/sendmail-smtp_auth |
${RELEASEDIR}/sendmail-smtp_auth |
fi |
fi |
if [ -e ${RELEASEDIR}/sendmail-smtp_auth ]; then |
if [ -e ${RELEASEDIR}/sendmail-smtp_auth ]; then |
install -o root -g smmsp -m 2555 \ |
if ! pkg_info -qe 'cyrus-sasl-*'; then |
|
$SUDO pkg_add -i cyrus-sasl |
|
fi |
|
|
|
$SUDO install -o root -g smmsp -m 2555 \ |
${RELEASEDIR}/sendmail-smtp_auth \ |
${RELEASEDIR}/sendmail-smtp_auth \ |
/usr/local/libexec/sendmail/sendmail |
/usr/libexec/sendmail/sendmail |
|
|
echo Installed sendmail with smtp_auth |
echo Installed sendmail with smtp_auth |
fi |
fi |
|
|
echo ERROR: No upgrade sets found! >&2 |
echo ERROR: No upgrade sets found! >&2 |
else |
else |
echo '### RUNNING SYSMERGE ###' |
echo '### RUNNING SYSMERGE ###' |
_args="-a $_args" |
if sysmerge 2>&1 | grep -- -a >/dev/null; then |
|
_args="-a $_args" |
|
fi |
$SUDO $SYSMERGE $_args |
$SUDO $SYSMERGE $_args |
fi |
fi |
fi |
fi |
|
|
|
|
INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`} |
INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`} |
|
|
CHECKSUM_TYPES=${CHECKSUM_TYPE:=SHA256 MD5} |
CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256 MD5} |
|
|
set_version |
set_version |
local _error=$? |
local _error=$? |
|
|
fi |
fi |
|
|
install_kernel |
install_kernel |
|
install_sets |
|
|
if [ $CUR_VER == $NEW_VER ]; then |
if [ $CUR_VER == $NEW_VER ]; then |
install_sets |
if [ -e /sbin/oreboot ]; then |
|
echo Removing /sbin/oreboot |
|
$SUDO rm -f /sbin/oreboot |
|
fi |
update_etc |
update_etc |
|
|
echo '### UPDATING PACKAGES ###' |
echo '### UPDATING PACKAGES ###' |
|
|
|
|
else |
else |
echo Instructions for updating to the new version available from |
echo Instructions for updating to the new version available from |
echo " http://www.openbsd.org/faq/upgrade${_v}.html" |
echo " http://www.openbsd.org/faq/upgrade${FILE_VER}.html" |
fi |
fi |
|
|
echo New kernel installed. Please reboot! |
echo New kernel installed. Please reboot! |
|
if [ -e /sbin/oreboot ]; then |
|
echo Possibly using /sbin/oreboot |
|
fi |