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

use the kernel version strings on KARL releases

Browse source
This commit is contained in:
Robert Nagy 2017-10-19 12:00:16 +02:00
commit 2e53c18fd2
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
openup
View file

@ -247,18 +247,21 @@ check_vuxml() {
do_i_need_to_reboot() { do_i_need_to_reboot() {
# XXX hardcoded PKG_DBDIR # XXX hardcoded PKG_DBDIR
local kern_time booted_time local osversion=$(sysctl -n kern.osversion)
local kern_version=$(sysctl -n kern.version | head -1)
local booted_version=$(what -s /bsd | tail -1 | tr -d '\t')
local booted_time=$(sysctl -n kern.boottime)
local kern_time=$(stat -qf "%Um" /bsd)
local warn=0
# Check /bsd.booted first if available due to kernel relinking # Check /bsd.booted first if available due to kernel relinking
if [ -e /bsd.booted ]; then if [ -e /bsd.booted ]; then
booted_time=$(stat -qf "%Um" /bsd.booted) [ X"${kern_version}" != X"${booted_version}" ] && warn=1
kern_time=$(stat -qf "%Um" /bsd)
else else
booted_time=$(sysctl -n kern.boottime) [ "${booted_time}" -lt "${kern_time}" ] && warn=1
kern_time=$(stat -qf "%Um" /bsd)
fi fi
if [ "${booted_time}" -lt "${kern_time}" ]; then if [ ${warn} -gt 0 ]; 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
@ -280,7 +283,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=30 _OPENUP_VERSION=31
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