From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 13 May 2024 13:08:07 +0000 (+0200)
Subject: TEST-64-UDEV-STORAGE: Check for tgt and tgtd services
X-Git-Tag: v256-rc2~18^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d760e2a8c3908bf2fc980bf7fb9a200ab4641669;p=thirdparty%2Fsystemd.git

TEST-64-UDEV-STORAGE: Check for tgt and tgtd services

On Debian/Ubuntu, the unit is named tgt.service instead of tgtd.service,
so let's make sure we take that into account.

On CentOS, tgtd.service is not available, so let's skip the test if we
can't find the service.
---

diff --git a/test/units/TEST-64-UDEV-STORAGE.sh b/test/units/TEST-64-UDEV-STORAGE.sh
index 728d57cb3f5..aed322fe85f 100755
--- a/test/units/TEST-64-UDEV-STORAGE.sh
+++ b/test/units/TEST-64-UDEV-STORAGE.sh
@@ -850,9 +850,17 @@ testcase_iscsi_lvm() {
 
     ls -l "${devices[@]}"
 
-    # Start the target daemon
-    systemctl start tgtd
-    systemctl status tgtd
+    # Start the target daemon (debian names it tgt.service so make sure we handle that)
+    if systemctl list-unit-files tgt.service; then
+        systemctl start tgt
+        systemctl status tgt
+    elif systemctl list-unit-files tgtd.service; then
+        systemctl start tgtd
+        systemctl status tgtd
+    else
+        echo "This test requires tgtd but it is not installed, skipping ..." | tee --append /skipped
+        exit 77
+    fi
 
     echo "iSCSI LUNs backed by devices"
     # See RFC3721 and RFC7143