From 6cdc6172341d09aad3a7253132b52823d31b6f51 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 2 Jun 2022 07:44:18 +0000 Subject: [PATCH] When running sysupgrade on -stable move to the next release, not -current. Found the hard way by & OK sthen --- usr.sbin/sysupgrade/sysupgrade.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/sysupgrade/sysupgrade.sh b/usr.sbin/sysupgrade/sysupgrade.sh index f9bd572979f..6386081b492 100644 --- a/usr.sbin/sysupgrade/sysupgrade.sh +++ b/usr.sbin/sysupgrade/sysupgrade.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: sysupgrade.sh,v 1.46 2022/03/03 10:12:08 sdk Exp $ +# $OpenBSD: sysupgrade.sh,v 1.47 2022/06/02 07:44:18 florian Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015 Robert Peichaer @@ -112,7 +112,9 @@ esac err "invalid installurl: $MIRROR" if ! $RELEASE && [[ ${#_KERNV[*]} == 2 ]]; then - SNAP=true + if [[ ${_KERNV[1]} != '-stable' ]]; then + SNAP=true + fi fi if $RELEASE && [[ ${_KERNV[1]} == '-beta' ]]; then -- 2.20.1