version 1.68, 2014/10/18 23:42:35 |
version 1.80, 2015/11/27 22:38:38 |
|
|
#!/bin/sh |
#!/bin/sh |
# $AFresh1: update_openbsd,v 1.67 2014/05/11 02:40:54 andrew Exp $ |
# $AFresh1: update_openbsd,v 1.79 2015/11/03 03:56:53 andrew Exp $ |
# |
# |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# |
# |
|
|
local xserv=/usr/X11R6/bin/X |
local xserv=/usr/X11R6/bin/X |
local xshare=/usr/X11R6/bin/startx |
local xshare=/usr/X11R6/bin/startx |
|
|
|
local _nv=`echo $NEW_VER | sed -e 's/\.//'` |
local _c _d _e |
local _c _d _e |
echo -n base |
echo -n base |
echo -n ' etc' |
[ $_nv -lt 57 ] && echo -n ' etc' |
for _d in misc man comp game xbase xetc xfont xserv xshare; do |
for _d in misc man comp game xbase xetc xfont xserv xshare; do |
|
[ $_d = xetc -a $_nv -ge 57 ] && continue |
eval _e=\$${_d} |
eval _e=\$${_d} |
_c=`ls $_e 2> /dev/null | wc -l` |
_c=`ls $_e 2> /dev/null | wc -l` |
#echo $_c $_d $_e |
#echo $_c $_d $_e |
|
|
if [ ! -e ./${_b} ]; then |
if [ ! -e ./${_b} ]; then |
echo "===> $FTP_CMD ${FTP}/${_b}" |
echo "===> $FTP_CMD ${FTP}/${_b}" |
$FTP_CMD ${FTP}/${_b} |
$FTP_CMD ${FTP}/${_b} |
|
else |
|
echo "===> Have ${_b}" |
fi |
fi |
|
kernel_file_version "${_b}" |
done |
done |
|
|
for _s in $INSTALLED_SETS; do |
for _s in $INSTALLED_SETS; do |
|
[ "$_v" -ge "57" -a "$_s" != "${_s%etc}" ] && continue |
local _file=${_s}${_v}.tgz |
local _file=${_s}${_v}.tgz |
if [ ${_s} == sendmail-smtp_auth ]; then |
if [ ${_s} == sendmail-smtp_auth ]; then |
_file=${_s}.gz |
_file=${_s}.gz |
|
|
local _file=$1 |
local _file=$1 |
# This could go circular, but I dunno how to fix that. |
# This could go circular, but I dunno how to fix that. |
if [ -h $_file ]; then |
if [ -h $_file ]; then |
follow_symlink $( file $_file | |
follow_symlink $( readlink -f $_file ) |
grep 'symbolic link' | |
|
sed -e s/^.*\\\`// -e s/\\\'\$// ) |
|
else |
else |
echo $_file |
echo $_file |
fi |
fi |
|
|
fi |
fi |
signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sha256 -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 | sha256 -c |
fi |
fi |
|
|
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
|
|
fi |
fi |
|
|
for _s in $INSTALLED_SETS; do |
for _s in $INSTALLED_SETS; do |
|
[ "$_v" -ge "57" -a "$_s" != "${_s%etc}" ] && continue |
local _file=${_s}${_v}.tgz |
local _file=${_s}${_v}.tgz |
if [ ${_s} == sendmail-smtp_auth ]; then |
if [ ${_s} == sendmail-smtp_auth ]; then |
_file=${_s}.gz |
_file=${_s}.gz |
|
|
|
|
local _type |
local _type |
for _type in $CHECKSUM_TYPES; do |
for _type in $CHECKSUM_TYPES; do |
|
[ -n "$NO_SIGNIFY" -a "$_type" != "${_type%.sig}" ] && continue |
if [ -e $_type ]; then |
if [ -e $_type ]; then |
check_sum $_type && break |
check_sum $_type && break |
[ -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1 |
[ -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1 |
|
|
local _v=$FILE_VER |
local _v=$FILE_VER |
local _args="" |
local _args="" |
|
|
if [ ! -e /usr/share/sysmerge/etc.tgz ]; then |
if [ ! -e /var/sysmerge/etc.tgz ]; then |
if [ X"" == X"$RELEASEDIR" ]; then |
if [ X"" == X"$RELEASEDIR" ]; then |
echo "ERROR: no source for etc!" >&2 |
echo "ERROR: no source for etc!" >&2 |
exit 1 |
exit 1 |
|
|
SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} |
SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} |
FORCE_DIR=${FORCE_DIR:=No} |
FORCE_DIR=${FORCE_DIR:=No} |
|
|
|
set_version |
|
|
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} |
|
|
set_version |
|
local _error=$? |
local _error=$? |
|
|
echo |
echo |
|
|
#echo " FILE_VER: $FILE_VER" |
#echo " FILE_VER: $FILE_VER" |
echo |
echo |
|
|
|
for k in $INSTALL_KERNELS; do |
|
if [ -e "/$k" ]; then |
|
echo "Existing $k" |
|
kernel_file_version "/$k" |
|
fi |
|
done |
|
|
if [ ${_error} -ne 0 ]; then |
if [ ${_error} -ne 0 ]; then |
exit ${_error} |
exit ${_error} |
fi |
fi |
|
|
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 "!!! sudo MAY NOT WORK after sets are extracted. !!!" >&2 |
echo "!!! doas MAY NOT WORK after sets are extracted. !!!" >&2 |
echo >&2 |
echo >&2 |
echo "enter to continue, ctrl+C to cancel" >&2 |
echo "enter to continue, ctrl+C to cancel" >&2 |
local _temp |
local _temp |
|
|
|
|
if [ -e /sbin/oreboot ]; then |
if [ -e /sbin/oreboot ]; then |
echo Removing /sbin/oreboot |
echo Removing /sbin/oreboot |
$rm -f /sbin/oreboot |
rm -f /sbin/oreboot |
fi |
fi |
update_etc |
update_etc |
|
|
echo '==> UPDATING PACKAGES' |
OPENUP=$( which openup ) |
pkg_add -ui -F update -F updatedepends |
if [ -n "$OPENUP" ]; then |
|
echo "==> UPDATING WITH $OPENUP" |
|
$OPENUP |
|
else |
|
echo '==> UPDATING PACKAGES' |
|
pkg_add -ui -F update -F updatedepends |
|
fi |
|
|
|
echo '==> UPDATING FIRMWARE' |
|
fw_update |
|
|
else |
else |
echo Instructions for updating to the new version available from |
echo Instructions for updating to the new version available from |