On 2022-06-01 06:57 +02, Florian Obser <flor...@openbsd.org> wrote:
> On 2022-05-31 23:27 +01, Stuart Henderson <s...@spacehopper.org> wrote:
>> I accidentally updated a router to -current instead of 7.1 and hit this.
>> (Thanks sysupgrade - it was running a 7.0-stable kernel before...)
>
> Hmm? Are you saying running just running 'sysupgrade', without any flags, 
> moves
> you from 7.0-stable to current?

sigh...

Is this better? It seems to do the right thing in my tests with -stable
and -current.
I think we need to revamp the chicken scratches, it got a bit unwieldy
to figure out what the damn thing is doing.

diff --git sysupgrade.sh sysupgrade.sh
index f9bd572979f..f70b017e59e 100644
--- sysupgrade.sh
+++ sysupgrade.sh
@@ -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


-- 
I'm not entirely sure you are real.

Reply via email to