version 1.2, 2008/08/12 23:07:05 |
version 1.8, 2008/10/13 19:31:49 |
|
|
#!/bin/sh |
#!/bin/sh |
# $RedRiver: update_openbsd,v 1.1 2008/08/12 18:45:47 andrew Exp $ |
# $RedRiver: update_openbsd,v 1.7 2008/10/11 22:19:52 andrew Exp $ |
|
|
SYSMERGE=/usr/sbin/sysmerge |
|
MIRROR=ftp://ftp.openbsd.org/pub/OpenBSD |
|
FTP_CMD='ftp -V' |
|
DESTDIR=/ |
|
|
|
if [ -e /etc/update_openbsd.conf ]; then |
if [ -e /etc/update_openbsd.conf ]; then |
. /etc/update_openbsd.conf |
. /etc/update_openbsd.conf |
fi |
fi |
|
|
. ${HOME}/.update_openbsdrc |
. ${HOME}/.update_openbsdrc |
fi |
fi |
|
|
|
MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD} |
|
FTP_CMD=${FTP_CMD:=ftp -V} |
|
PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/} |
|
|
|
DESTDIR=${DESTDIR:=/} |
|
SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} |
|
if [ ! -e $SYSMERGE ]; then |
|
SYSMERGE= |
|
fi |
|
|
installed_sets() { |
installed_sets() { |
misc=/usr/share/doc/README |
local misc=/usr/share/doc/README |
man=/usr/share/man/cat1/intro.0 |
local man=/usr/share/man/cat1/intro.0 |
comp=/usr/bin/cc |
local comp=/usr/bin/cc |
game=/usr/games/ |
local game=/usr/games/ |
xbase=/usr/X11R6/ |
local xbase=/usr/X11R6/ |
xetc=/etc/X11/xinit/xinitrc |
local xetc=/etc/X11/xinit/xinitrc |
xfont=/usr/X11R6/lib/X11/fonts |
local xfont=/usr/X11R6/lib/X11/fonts |
xserv=/usr/X11R6/bin/X |
local xserv=/usr/X11R6/bin/X |
xshare=/usr/X11R6/bin/startx |
local xshare=/usr/X11R6/bin/startx |
|
|
echo base |
local _c _d _e |
echo etc |
echo -n base |
for d in misc man comp game xbase xetc xfont xserv xshare; do |
echo -n ' etc' |
eval e=\$$d |
for _d in misc man comp game xbase xetc xfont xserv xshare; do |
c=`ls ${e} 2> /dev/null | wc -l` |
eval _e=\$${_d} |
#echo $c $d $e |
_c=`ls $_e 2> /dev/null | wc -l` |
if [ ${c} -ne 0 ]; then |
#echo $_c $_d $_e |
echo $d |
if [ $_c -ne 0 ]; then |
|
echo -n " $_d" |
fi |
fi |
done |
done |
} |
} |
|
INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`} |
|
|
|
|
set_version() { |
set_version() { |
CUR_VER=`uname -r` |
CUR_VER=`uname -r` |
NEW_VER=`dc -e "${CUR_VER} 0.1 + p"` |
NEW_VER=`dc -e "$CUR_VER 0.1 + p"` |
|
FILE_VER="" |
|
FTP="" |
|
|
if [ -d $NEW_VER ]; then |
local _cv=`echo $CUR_VER | sed -e 's/\.//'` |
DIR=$NEW_VER |
local _nv=`echo $NEW_VER | sed -e 's/\.//'` |
fi |
local _v="" |
|
|
if [ -d $CUR_VER ]; then |
if [ X"" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then |
|
_dir=$FORCE_DIR |
|
if [ -e ${_dir}/base${_nv}.tgz ]; then |
|
_v=$_nv |
|
elif [ -e ${_dir}/base${_cv}.tgz ]; then |
|
NEW_VER=$CUR_VER |
|
_v=$_cv |
|
fi |
|
|
|
elif [ -d $CUR_VER ]; then |
|
_dir=$CUR_VER |
NEW_VER=$CUR_VER |
NEW_VER=$CUR_VER |
DIR=$NEW_VER |
if [ -e ${_dir}/base${_cv}.tgz ]; then |
fi |
_v=$_cv |
|
fi |
|
|
if [ X"" != X"$FORCE_DIR" ]; then |
elif [ -d $NEW_VER ]; then |
if [ -d $FORCE_DIR ]; then |
_dir=$NEW_VER |
DIR=${FORCE_DIR} |
if [ -e ${_dir}/base${_nv}.tgz ]; then |
|
_v=$_nv |
_cv=`echo $CUR_VER | sed -e 's/\.//'` |
|
if [ -e $DIR/base${_cv}.tgz ]; then |
|
NEW_VER=$CUR_VER |
|
fi |
|
fi |
fi |
|
|
fi |
fi |
|
|
if [ X"" == X"$DIR" ]; then |
if [ X"" == X"${_v}" ]; then |
FTP=${MIRROR}/${NEW_VER}/`machine` |
if [ X"" == X"${FORCE_DIR}" ]; then |
|
_dir=${NEW_VER} |
|
else |
|
_dir=${FORCE_DIR} |
|
fi |
|
FTP=${MIRROR}/${_dir}/`machine` |
|
|
#echo "ls\nquit\n" | ftp ${MIRROR} | grep "${NEW_VER}" |
local _file=`echo "ls base${_cv}.tgz" | ${FTP_CMD} ${FTP}/ | awk '{ print $9 }'` |
${FTP_CMD} ${FTP}/MD5 > /dev/null |
|
|
|
if [ -e MD5 ]; then |
if [ X"base${_cv}.tgz" == X"${_file}" ]; then |
rm -f MD5 |
|
else |
|
NEW_VER=$CUR_VER |
NEW_VER=$CUR_VER |
|
_v=$_cv |
|
else |
|
_v=$_nv |
fi |
fi |
|
|
if [ X"$FORCE_DIR" == X"" ]; then |
if [ X"" == X"$FORCE_DIR" ]; then |
DIR=$NEW_VER |
_dir=$NEW_VER |
else |
|
DIR=$FORCE_DIR |
|
fi |
fi |
|
|
FTP=${MIRROR}/${DIR}/`machine` |
|
fi |
fi |
|
|
if [ X"" != X"${RELEASEDIR}" ]; then |
if [ X"" == X"${_v}" ]; then |
DIR=${RELEASEDIR} |
echo ERROR: Unable to determine file version! >&2 |
|
exit 1 |
fi |
fi |
|
|
if [ -d $DIR ]; then |
if [ X"" == X"$RELEASEDIR" ]; then |
cd $DIR |
RELEASEDIR=`pwd`/$_dir |
RELEASEDIR=`pwd` |
|
fi |
fi |
|
FILE_VER=$_v |
_v=`echo $NEW_VER | sed -e 's/\.//'` |
FTP=${MIRROR}/${_dir}/`machine` |
} |
} |
|
|
get_sets() { |
get_sets() { |
|
echo '### GETTING SETS ###' |
if [ X"" == X"$FTP" ]; then |
if [ X"" == X"$FTP" ]; then |
echo Error, no FTP site is set! >&2 |
echo ERROR: No FTP site set! >&2 |
exit 1 |
exit 1 |
fi |
fi |
|
|
if [ X"" == X"$RELEASEDIR" ]; then |
mkdir -p ${RELEASEDIR} |
RELEASEDIR=$DIR |
cd $RELEASEDIR |
fi |
|
|
|
mkdir -p $RELEASEDIR |
local _v=$FILE_VER |
cd ${RELEASEDIR} |
|
RELEASEDIR=`pwd` |
|
|
|
for _b in /bsd* bsd bsd.mp bsd.rd; do |
for _b in `echo /bsd* bsd bsd.mp bsd.rd | sort -u`; do |
if [ -e /${_b} -a ! -e ./${_b} ]; then |
if [ -e /${_b} -a ! -e ./${_b} ]; then |
echo ${FTP_CMD} ${FTP}/${_b} |
echo $FTP_CMD ${FTP}/${_b} |
${FTP_CMD} ${FTP}/${_b} |
$FTP_CMD ${FTP}/${_b} |
fi |
fi |
done |
done |
|
|
for _s in `installed_sets`; do |
for _s in $INSTALLED_SETS; do |
echo ${FTP_CMD} ${FTP}/${_s}${_v}.tgz |
if [ ! -e ./${_s}${_v}.tgz ]; then |
${FTP_CMD} ${FTP}/${_s}${_v}.tgz |
echo $FTP_CMD ${FTP}/${_s}${_v}.tgz |
|
$FTP_CMD ${FTP}/${_s}${_v}.tgz |
|
fi |
done |
done |
|
|
echo ${FTP_CMD} ${FTP}/MD5 |
if [ ! -e MD5 ]; then |
${FTP_CMD} ${FTP}/MD5 |
echo $FTP_CMD ${FTP}/MD5 |
|
$FTP_CMD ${FTP}/MD5 |
|
fi |
|
|
ls bsd* *.tgz > index |
ls bsd* *.tgz > index |
grep -f index MD5 | md5 -c |
grep -f index MD5 | md5 -c |
|
|
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
echo !!! WARNING: MD5 does not match !!! >&2 |
echo ERROR: MD5 does not match! >&2 |
exit 1 |
exit 1 |
fi |
fi |
} |
} |
|
|
install_kernel() { |
install_kernel() { |
if [ X"${USER}" != X"root" -a X"${SUDO}" == X"" ]; then |
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 |
echo ${0##*/} must be run as root or SUDO must be set! >&2 |
exit 1 |
exit 1 |
fi |
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 |
exit 1 |
exit 1 |
else |
else |
cd $RELEASEDIR |
cd $RELEASEDIR |
fi |
fi |
|
|
if [ ! -e bsd ]; then |
if [ ! -e bsd ]; then |
echo "new bsd kernel does not exist!" >&2 |
echo ERROR: new bsd kernel does not exist! >&2 |
exit 1 |
exit 1 |
fi |
fi |
|
|
if [ -e /bsd.mp -a ! -e bsd.mp ]; then |
if [ -e /bsd.mp -a ! -e bsd.mp ]; then |
echo "new bsd.mp kernel does not exist!" >&2 |
echo ERROR: new bsd.mp kernel does not exist! >&2 |
exit 1 |
exit 1 |
fi |
fi |
|
|
if [ ! -e bsd.rd ]; then |
if [ ! -e bsd.rd ]; then |
echo "new bsd.rd kernel does not exist!" >&2 |
echo ERROR: new bsd.rd kernel does not exist! >&2 |
exit 1 |
exit 1 |
fi |
fi |
|
|
|
local _v=$FILE_VER |
if [ -e base${_v}.tgz ]; then |
if [ -e base${_v}.tgz ]; then |
echo Extracting new firmware from base${_v}.tgz |
echo Extracting new firmware from base${_v}.tgz |
${SUDO} tar -C ${DESTDIR} -xzphf base${_v}.tgz "*etc/firmware/*" |
$SUDO tar -C $DESTDIR -xzphf base${_v}.tgz "*etc/firmware/*" |
fi |
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!" |
exit 1 |
exit 1 |
fi |
fi |
|
|
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 |
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
echo "ERROR: Couldn't copy new SP kernel!" >&2 |
echo ERROR: Could not copy new SP kernel! >&2 |
exit 1 |
exit 1 |
fi |
fi |
else |
else |
if [ -e /${b} ]; then |
if [ -e /$_b ]; then |
echo Copying ${b} to / |
echo Copying $_b to / |
${SUDO} cp ${b} /nbsd && ${SUDO} mv /nbsd /${b} |
$SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b} |
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
echo "ERROR: Couldn't copy new ${b} kernel!" >&2 |
echo ERROR: Could not copy new $_b kernel! >&2 |
exit 1 |
exit 1 |
fi |
fi |
fi |
fi |
|
|
if [ ! -h /bsd ]; then |
if [ ! -h /bsd ]; then |
if [ -e /bsd.mp ]; then |
if [ -e /bsd.mp ]; then |
echo linking /bsd.mp to /bsd |
echo linking /bsd.mp to /bsd |
${SUDO} ln -sf /bsd.mp /bsd |
$SUDO ln -sf /bsd.mp /bsd |
else |
else |
echo linking /bsd.sp to /bsd |
echo linking /bsd.sp to /bsd |
${SUDO} ln -sf /bsd.sp /bsd |
$SUDO ln -sf /bsd.sp /bsd |
fi |
fi |
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
echo "ERROR: Couldn't symlink new kernel!" >&2 |
echo ERROR: Could not symlink new kernel! >&2 |
exit 1 |
exit 1 |
fi |
fi |
fi |
fi |
} |
} |
|
|
install_sets() { |
install_sets() { |
if [ X"${USER}" != X"root" -a X"${SUDO}" == X"" ]; then |
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 |
echo ${0##*/} must be run as root or SUDO must be set! >&2 |
exit 1 |
exit 1 |
fi |
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 |
exit 1 |
exit 1 |
else |
else |
cd $RELEASEDIR |
cd $RELEASEDIR |
fi |
fi |
|
|
|
local _v=$FILE_VER |
|
|
for _f in *${_v}.tgz; do |
for _f in *${_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 |
if [ X"" != X"$SYSMERGE" ]; then |
continue |
continue |
fi |
fi |
_path=/var/tmp/temproot |
_path=/var/tmp/temproot |
fi |
fi |
|
|
echo Extracting ${_f} to $_path |
echo Extracting $_f to $_path |
${SUDO} mkdir -p $_path |
$SUDO mkdir -p $_path |
${SUDO} tar -C $_path -xzphf ${RELEASEDIR}/${_f} |
$SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f} |
if [ $? -ne 0 ]; then |
if [ $? -ne 0 ]; then |
echo "Error extracting ${_f}!" >&2 |
echo ERROR: Could not extract ${_f}! >&2 |
exit 1 |
exit 1 |
fi |
fi |
done |
done |
|
|
} |
} |
|
|
update_etc() { |
update_etc() { |
if [ X"" == X"${SYSMERGE}" ]; then |
echo '### UPDATING ETC ###' |
|
if [ X"" == X"$SYSMERGE" ]; then |
if [ -e /var/tmp/temproot ]; then |
if [ -e /var/tmp/temproot ]; then |
MERGEMASTER=`which mergemaster` |
MERGEMASTER=`which mergemaster` |
|
|
if [ $? != 0 ]; then |
if [ $? != 0 ]; then |
${SUDO} pkg_add -i mergemaster |
$SUDO pkg_add -i mergemaster |
|
|
MERGEMASTER=`which mergemaster` |
MERGEMASTER=`which mergemaster` |
if [ $? != 0 ]; then |
if [ $? != 0 ]; then |
echo ERROR: mergemaster not installed! >&2 |
echo ERROR: mergemaster not installed! >&2 |
|
|
fi |
fi |
|
|
echo '### RUNNING MERGEMASTER ###' |
echo '### RUNNING MERGEMASTER ###' |
${SUDO} ${MERGEMASTER} -irv |
$SUDO $MERGEMASTER -irv |
else |
else |
echo "ERROR: no source for etc!" >&2 |
echo "ERROR: no source for etc!" >&2 |
exit 1 |
exit 1 |
|
|
cd $RELEASEDIR |
cd $RELEASEDIR |
fi |
fi |
|
|
_cv=`echo $CUR_VER | sed -e 's/\.//'` |
local _v=$FILE_VER |
if [ -e etc${_cv}.tgz ]; then |
if [ -e etc${_v}.tgz ]; then |
_args="${_args} -s etc${_cv}.tgz" |
_args="$_args -s etc${_v}.tgz" |
fi |
fi |
if [ -e xetc${_cv}.tgz ]; then |
if [ -e xetc${_v}.tgz ]; then |
_args="${_args} -x xetc${_cv}.tgz" |
_args="$_args -x 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 |
else |
else |
echo '### RUNNING SYSMERGE ###' |
echo '### RUNNING SYSMERGE ###' |
_args="-a $_args" |
_args="-a $_args" |
${SUDO} ${SYSMERGE} $_args |
$SUDO $SYSMERGE $_args |
fi |
fi |
fi |
fi |
} |
} |
|
|
|
|
PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/} |
|
|
|
if [ ! -e ${SYSMERGE} ]; then |
|
SYSMERGE= |
|
fi |
|
|
|
set_version |
set_version |
|
|
echo |
echo |
echo "-= update_openbsd - helper script to update OpenBSD =-" |
echo "-= update_openbsd - helper script to update OpenBSD =-" |
echo "------------------------------------------------------" |
echo "------------------------------------------------------" |
echo |
echo |
echo " DIR: $DIR" |
echo " SUDO: $SUDO" |
echo "RELEASEDIR: $RELEASEDIR" |
echo " SYSMERGE: $SYSMERGE" |
echo " DESTDIR: $DESTDIR" |
echo " MIRROR: $MIRROR" |
echo " CUR_VER: $CUR_VER" |
echo " RELEASEDIR: $RELEASEDIR" |
echo " NEW_VER: $NEW_VER" |
echo " DESTDIR: $DESTDIR" |
echo " SUDO: $SUDO" |
echo "INSTALLED_SETS: $INSTALLED_SETS" |
echo " SYSMERGE: $SYSMERGE" |
|
echo " MIRROR: $MIRROR" |
|
echo |
echo |
|
echo " CUR_VER: $CUR_VER" |
|
echo " NEW_VER: $NEW_VER" |
|
#echo " FILE_VER: $FILE_VER" |
|
echo |
|
|
if [ X"" == X"$RELEASEDIR" ]; then |
get_sets |
echo '### GETTING SETS ###' |
|
get_sets |
|
fi |
|
|
|
if [ X"" != X"$SUDO" ]; then |
if [ X"" != X"$SUDO" ]; then |
echo Please enter your sudo password if prompted. |
echo Please enter your sudo password if prompted. |
|
|
$SUDO -v |
$SUDO -v |
fi |
fi |
|
|
echo '### INSTALLING KERNEL ###' |
|
install_kernel |
install_kernel |
|
|
if [ $CUR_VER == $NEW_VER -o X"" != X"$FORCE_DIR" ]; then |
if [ $CUR_VER == $NEW_VER ]; then |
echo '### INSTALLING SETS ###' |
|
install_sets |
install_sets |
|
|
echo '### UPDATING ETC ###' |
|
update_etc |
update_etc |
|
|
echo '### UPDATING PACKAGES ###' |
echo '### UPDATING PACKAGES ###' |