]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: also test verity signatures on debian testing/unstable
authorLuca Boccassi <luca.boccassi@gmail.com>
Wed, 15 Oct 2025 17:46:00 +0000 (18:46 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Thu, 6 Nov 2025 23:38:13 +0000 (23:38 +0000)
debian testing/unstable do not set VERSION_ID, so if missing, assume
it's testing/unstable which are new enough

(cherry picked from commit dc88805d16f9ca28deb061322bcab1bc52e5f0a0)

test/units/TEST-50-DISSECT.sh

index 033c818c880376c8afc70add94c226c30ff97ac4..b42aa6e7b323de8b443ccfecc432bb2c922c955a 100755 (executable)
@@ -38,7 +38,7 @@ loginctl enable-linger testuser
 # https://oracle.github.io/kconfigs/?config=UTS_RELEASE&config=DM_VERITY_VERIFY_ROOTHASH_SIG&config=DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING&config=DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING&config=IMA_ARCH_POLICY&config=INTEGRITY_MACHINE_KEYRING
 if grep -q "$(openssl x509 -noout -subject -in /usr/share/mkosi.crt | sed 's/^.*CN=//')" /proc/keys && \
         ( . /etc/os-release; [ "$ID" != "centos" ] || systemd-analyze compare-versions "$VERSION_ID" ge 10 ) && \
-        ( . /etc/os-release; [ "$ID" != "debian" ] || systemd-analyze compare-versions "$VERSION_ID" ge 13 ) && \
+        ( . /etc/os-release; [ "$ID" != "debian" ] || [ -z "${VERSION_ID:-}" ] || systemd-analyze compare-versions "$VERSION_ID" ge 13 ) && \
         ( . /etc/os-release; [ "$ID" != "ubuntu" ] || systemd-analyze compare-versions "$VERSION_ID" ge 24.04 ) && \
         systemd-analyze compare-versions "$(cryptsetup --version | sed 's/^cryptsetup \([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/')" ge 2.3.0; then
     export VERITY_SIG_SUPPORTED=1