From f89d2045341e1007b1ed9988ce62854604bc33f3 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 7 Jul 2016 14:35:43 +0000
Subject: [PATCH] sanity-check: assert that /etc/os-release NAME is correct
NAME was fixed (in T133). Unfortunately, ID wasn't fixed (opens: T2117).
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D3650
---
common/sanity-check | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/sanity-check b/common/sanity-check
index 1353bc0..cb47ea3 100755
--- a/common/sanity-check
+++ b/common/sanity-check
@@ -46,10 +46,10 @@ test -S /run/user/$(id -u user)/bus || fail user-bus-is-up
test -e /etc/debian_version || fail has-debian_version
cat /etc/os-release || fail os-release
-# These two should really test for Apertis, but that would currently
-# fail - see https://phabricator.apertis.org/T133 - so they also
+grep -E '^NAME=("?)Apertis\1$' /etc/os-release || fail os-release-name
+# This should really test for apertis, but that would currently
+# fail - see https://phabricator.apertis.org/T2117 - so they also
# allow Ubuntu
-grep -E '^NAME=("?)(Apertis|Ubuntu)\1$' /etc/os-release || fail os-release-name
grep -E '^ID=("?)(apertis|ubuntu)\1$' /etc/os-release || fail os-release-id
if ! test -S /run/user/$(id -u user)/wayland-0; then
--
GitLab