From: afresh1 <afresh1@openbsd.org>
Date: Sun, 20 Feb 2022 21:53:04 +0000 (+0000)
Subject: Only use /snapshots dir when -current
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0bdd0b6fcd4bedbdd3b94c52f7ae3636336ba9c4;p=openbsd

Only use /snapshots dir when -current

Not during release, -stable, or -beta.

This diverges from how packages work and how things were done in the past
where -beta also looked in /snapshots.

Discussed in icb.
OK deraadt@
---

diff --git a/usr.sbin/fw_update/fw_update.sh b/usr.sbin/fw_update/fw_update.sh
index 06412feca81..238eb9c20f4 100644
--- a/usr.sbin/fw_update/fw_update.sh
+++ b/usr.sbin/fw_update/fw_update.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_update.sh,v 1.41 2022/02/20 19:24:19 afresh1 Exp $
+#	$OpenBSD: fw_update.sh,v 1.42 2022/02/20 21:53:04 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -29,7 +29,7 @@ VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"}
 HTTP_FWDIR="$VNAME"
 VTYPE=$( sed -n "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p" \
     /var/run/dmesg.boot | sed '$!d' )
-[[ $VTYPE == -!(stable) ]] && HTTP_FWDIR=snapshots
+[ "$VTYPE" = -current ] && HTTP_FWDIR=snapshots
 
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub