ston1th/openup
1
0
Fork 0
forked from mirrors/openup
Code Releases Activity

do better checks on the boted kernel

Browse source
This commit is contained in:
Robert Nagy 2017-10-17 18:40:11 +02:00
commit 6feca2f453
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
openup
View file

@ -247,14 +247,18 @@ check_vuxml() {
do_i_need_to_reboot() { do_i_need_to_reboot() {
# XXX hardcoded PKG_DBDIR # XXX hardcoded PKG_DBDIR
local kern_time local kern_time booted_time
local wake_up=$(sysctl -n kern.boottime)
# Check /bsd.booted first if available due to kernel relinking # Check /bsd.booted first if available due to kernel relinking
[ -e /bsd.booted ] && kern_time=$(stat -qf "%Um" /bsd.booted) || \ if [ -e /bsd.booted ]; then
booted_time=$(stat -qf "%Um" /bsd.booted)
kern_time=$(stat -qf "%Um" /bsd) kern_time=$(stat -qf "%Um" /bsd)
else
booted_time=$(sysctl -n kern.boottime)
kern_time=$(stat -qf "%Um" /bsd)
fi
if [ "${wake_up}" -lt "${kern_time}" ]; then if [ "${booted_time}" -lt "${kern_time}" ]; then
pr_err pr_err
pr_err "System must be rebooted after the last kernel update" pr_err "System must be rebooted after the last kernel update"
pr_err pr_err
@ -276,7 +280,7 @@ fi
set -A _REL -- $(sysctl -n kern.version | sed 's/^OpenBSD \([0-9]\.[0-9]\)\([^ ]*\).*/\1 \2/;q') set -A _REL -- $(sysctl -n kern.version | sed 's/^OpenBSD \([0-9]\.[0-9]\)\([^ ]*\).*/\1 \2/;q')
_REL_INT="$(echo ${_REL[0]} | tr -d '.')" _REL_INT="$(echo ${_REL[0]} | tr -d '.')"
_OPENUP_MINREL=60 _OPENUP_MINREL=60
_OPENUP_VERSION=29 _OPENUP_VERSION=30
if [ -n "${_REL[1]}" -a "${_REL[1]}" != "-stable" ]; then _badrel=1; fi if [ -n "${_REL[1]}" -a "${_REL[1]}" != "-stable" ]; then _badrel=1; fi
if [ "${_REL_INT}" -lt "${_OPENUP_MINREL}" ]; then _badrel=1; fi if [ "${_REL_INT}" -lt "${_OPENUP_MINREL}" ]; then _badrel=1; fi
if [ -n "${_badrel}" ]; then if [ -n "${_badrel}" ]; then