version 1.95, 2017/12/10 21:19:11 |
version 1.103, 2017/12/11 02:50:09 |
|
|
#!/bin/sh |
#!/bin/sh |
# $AFresh1: update_openbsd,v 1.94 2017/12/10 21:16:05 andrew Exp $ |
# $AFresh1: update_openbsd,v 1.102 2017/12/11 02:36:03 andrew Exp $ |
# |
# |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com> |
# |
# |
|
|
_file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'` |
_file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'` |
|
|
elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then |
elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then |
local _list=`${FTP_CMD} -V -o - ${FTP}/` |
_file=`${FTP_CMD} -V -o - ${FTP}/index.txt | |
_file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ { |
sed -ne 's/.*\(base[0-9][0-9].tgz\).*/\1/p'` |
sub("^.*base","base"); |
|
sub("\.tgz.*",".tgz"); |
|
print $0; |
|
}'` |
|
|
|
elif [ X"scp" == X"${_proto}" ]; then |
elif [ X"scp" == X"${_proto}" ]; then |
echo SCP is not yet supported >&2 |
echo SCP is not yet supported >&2 |
return 2 |
return 2 |
|
|
else |
else |
echo Unsupported FTP ${FTP} >&2 |
echo Unsupported FTP ${FTP} >&2 |
return 2 |
return 2 |
|
|
|
|
echo $_v |
echo $_v |
} |
} |
|
|
|
set_boot_device() { |
|
BOOT_DEVICE=$( df -nP /bsd | sed -ne 's! .*/$!!p' ) |
|
|
|
root_disk=$( echo $BOOT_DEVICE | |
|
sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' ) |
|
msdos_partition=$( |
|
fdisk $root_disk | grep -q '^*.*FAT32' \ |
|
&& \ |
|
disklabel $root_disk | sed -ne 's/:.*MSDOS//p' | tr -d ' ' |
|
) |
|
|
|
[ "$msdos_partition" ] && |
|
BOOT_DEVICE="/dev/$root_disk$msdos_partition" |
|
} |
|
|
|
boot_device_mounted="" |
|
mount_boot_device() { |
|
[ "$boot_device_mounted" ] && return |
|
|
|
local default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' ) |
|
local boot_mount=$( mount | |
|
sed -ne "s!^$BOOT_DEVICE on \([^ ]*\).*!\1!p" ) |
|
|
|
if [ ! "$boot_mount" ]; then |
|
mount $BOOT_DEVICE /mnt |
|
boot_device_mounted=1 |
|
KERNEL_ROOT=/mnt |
|
elif [ "$boot_mount" != "$default_mount" ]; then |
|
KERNEL_ROOT=$boot_mount/ |
|
else |
|
KERNEL_ROOT=${default_mount%/}/ |
|
fi |
|
} |
|
|
|
umount_boot_device() { |
|
[ "$boot_device_mounted" ] && umount $BOOT_DEVICE |
|
boot_device_mounted="" |
|
} |
|
|
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"` |
|
|
FTP=${MIRROR}/${_dir}/`machine` |
FTP=${MIRROR}/${_dir}/`machine` |
fi |
fi |
|
|
|
KERNEL_ROOT="" |
|
[ -z "$BOOT_DEVICE" ] && set_boot_device |
|
|
BOOT_KERNEL=`( \ |
BOOT_KERNEL=`( \ |
echo bsd; \ |
echo bsd; \ |
[ -e /boot.conf ] && sed -E '/^ *(set +image|boot) +/!d ; \ |
[ -e /boot.conf ] && sed -E '/^ *(set +image|boot) +/!d ; \ |
|
|
|
|
|
|
install_kernels() { |
install_kernels() { |
echo '==> INSTALLING KERNEL' |
local _d=$1 |
|
local default_mount |
|
local boot_mount |
|
local mount_is_msdos |
|
|
|
if [ ! "$_d" ]; then |
|
default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' ) |
|
mount_boot_device |
|
|
|
if [ "$KERNEL_ROOT" != "$default_mount" ]; then |
|
local _ik="$INSTALL_KERNELS" |
|
INSTALL_KERNELS="${BOOT_KERNEL#/} bsd.rd" |
|
|
|
install_kernels $KERNEL_ROOT |
|
|
|
INSTALL_KERNELS="$_ik" |
|
fi |
|
|
|
umount_boot_device |
|
|
|
install_kernels $default_mount |
|
return |
|
fi |
|
|
|
echo "==> INSTALLING KERNEL to $_d" |
|
|
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 |
fi |
fi |
|
|
|
[ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1 |
|
|
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 ${_d}obsd" |
ln -f $BOOT_KERNEL /obsd |
if [ $mount_is_msdos ]; then |
|
cp $BOOT_KERNEL ${_d}obsd |
|
else |
|
ln -f $BOOT_KERNEL ${_d}obsd |
|
fi |
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 |
rm -f /nbsd |
rm -f ${_d}nbsd |
local _bd=$_b |
local _bd=$_b |
[ X"${_b}" == X"bsd" ] && _bd="bsd.sp" |
[ X"${_b}" == X"bsd" ] && _bd="bsd.sp" |
|
|
local _is_boot="" |
local _is_boot="" |
[ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel" |
[ X"$BOOT_KERNEL" == X"${_d}${_bd}" ] && _is_boot="# boot kernel" |
|
|
echo "Copying $_b to /$_bd $_is_boot" |
echo "Copying $_b to ${_d}$_bd $_is_boot" |
cp ${_b} /nbsd && mv /nbsd /${_bd} |
cp ${_b} ${_d}nbsd && mv ${_d}nbsd ${_d}${_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 |
|
|
|
|
cd $OLDPWD |
cd $OLDPWD |
|
|
if [ ! -h /bsd ]; then |
if [ ! -h ${_d}bsd ]; then |
cd / |
cd ${_d} |
for _b in $BOOT_KERNELS; do |
for _b in $BOOT_KERNELS; do |
[ 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" |
if [ "$mount_is_msdos" ]; then |
ln -sf $_b bsd |
echo "===> Moving $_b ${_d}bsd (MSDOS)" |
if [ $? -ne 0 ]; then |
mv -f ${_b} bsd |
echo ERROR: Could not symlink new kernel! >&2 |
else |
exit 1 |
echo "===> symlinking $_b to ${_d}bsd" |
|
ln -sf $_b bsd |
fi |
fi |
break |
break |
fi |
fi |
done |
done |
cd $OLDPWD |
cd $OLDPWD |
fi |
fi |
} |
} |
|
|
|
|
echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH" |
echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH" |
echo " RELEASEDIR: $RELEASEDIR" |
echo " RELEASEDIR: $RELEASEDIR" |
echo " DESTDIR: $DESTDIR" |
echo " DESTDIR: $DESTDIR" |
|
echo " BOOT_DEVICE: $BOOT_DEVICE" |
echo " BOOT_KERNEL: $BOOT_KERNEL" |
echo " BOOT_KERNEL: $BOOT_KERNEL" |
echo " INSTALL_KERNELS: $INSTALL_KERNELS" |
echo " INSTALL_KERNELS: $INSTALL_KERNELS" |
echo " INSTALLED_SETS: $INSTALLED_SETS" |
echo " INSTALLED_SETS: $INSTALLED_SETS" |