From 6feca2f453b6223c1d0c19f26d81d7b0f016e430 Mon Sep 17 00:00:00 2001
From: Robert Nagy <robert@mtier.org>
Date: Tue, 17 Oct 2017 18:40:11 +0200
Subject: [PATCH] do better checks on the boted kernel

---
 openup | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/openup b/openup
index 2fb4af5..1144bd8 100755
--- a/openup
+++ b/openup
@@ -247,14 +247,18 @@ check_vuxml() {
 
 do_i_need_to_reboot() {
 	# XXX hardcoded PKG_DBDIR
-	local kern_time
-	local wake_up=$(sysctl -n kern.boottime)
+	local kern_time booted_time
 
 	# 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)
+	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 "System must be rebooted after the last kernel update"
 		pr_err
@@ -276,7 +280,7 @@ fi
 set -A _REL -- $(sysctl -n kern.version | sed 's/^OpenBSD \([0-9]\.[0-9]\)\([^ ]*\).*/\1 \2/;q')
 _REL_INT="$(echo ${_REL[0]} | tr -d '.')"
 _OPENUP_MINREL=60
-_OPENUP_VERSION=29
+_OPENUP_VERSION=30
 if [ -n "${_REL[1]}" -a "${_REL[1]}" != "-stable" ]; then _badrel=1; fi
 if [ "${_REL_INT}" -lt "${_OPENUP_MINREL}" ]; then _badrel=1; fi
 if [ -n "${_badrel}" ]; then