Add "--" delimiter to support mount unit for /

The mount unit for the / filesystem is named -.mount. It is treated
like an option because it begins with a “-”. It is fixed with the
delimiter “--”, which is inserted before the unit.

Author: CarstenGrohmann

test/test_modules.py

@@ -147,6 +147,7 @@ def test_service_systemd_ssh(host, docker_image):
     assert ssh_service.is_running
 
 
+@pytest.mark.testinfra_hosts("docker://rockylinux9")
 def test_service_systemd_root_mount(host):
     root_mount_service = host.service("-.mount")  # systemd unit for mounting /
     assert root_mount_service.exists
@@ -176,6 +177,7 @@ def test_service_systemd_root_mount_is_enabled(host):
     assert not root_mount_service.is_enabled
 
 
+@pytest.mark.testinfra_hosts("docker://rockylinux9")
 def test_service_systemd_tmp_mount(host):
     tmp = host.service("tmp.mount")
     assert tmp.exists

testinfra/modules/service.py

@@ -169,7 +169,7 @@ class SystemdService(SysvService):
 
     def _has_systemd_suffix(self):
         """
-        Check if service name has a known systemd unit suffix
+        Check if the service name has a known systemd unit suffix
         """
         unit_suffix = self.name.split(".")[-1]
         return unit_suffix in self.suffix_list
@@ -182,7 +182,7 @@ def exists(self):
         # 2: unused
         # 3: unit is not active
         # 4: no such unit
-        cmd = self.run_expect([0, 1, 3, 4], "systemctl status %s", self.name)
+        cmd = self.run_expect([0, 1, 3, 4], "systemctl status -- %s", self.name)
         return cmd.rc < 4
 
     @property
@@ -192,15 +192,15 @@ def is_running(self):
         # 1: program is dead and pid file exists
         # 3: not running and pid file does not exists
         # 4: Unable to determine status (no such unit)
-        out = self.run_expect([0, 1, 3, 4], "systemctl is-active %s", self.name)
+        out = self.run_expect([0, 1, 3, 4], "systemctl is-active -- %s", self.name)
         if out.rc == 1:
             # Failed to connect to bus: No such file or directory
             return super().is_running
         return out.rc == 0
 
     @property
     def is_enabled(self):
-        cmd = self.run_test("systemctl is-enabled %s", self.name)
+        cmd = self.run_test("systemctl is-enabled -- %s", self.name)
         if cmd.rc == 0:
             return True
         if cmd.stdout.strip() == "disabled":
@@ -217,7 +217,7 @@ def is_enabled(self):
     def is_valid(self):
         # systemd-analyze requires a full unit name.
         name = self.name if self._has_systemd_suffix() else f"{self.name}.service"
-        cmd = self.run("systemd-analyze verify %s", name)
+        cmd = self.run("systemd-analyze verify -- %s", name)
         # A bad unit file still returns a rc of 0, so check the
         # stdout for anything. Nothing means no warns/errors.
         # Docs at https://www.freedesktop.org/software/systemd/man/systemd
@@ -240,16 +240,17 @@ def is_valid(self):
         ]
 
         stderr = "".join(stderr_lines)
-        return (cmd.stdout, stderr) == ("", "")
+        return (cmd.stdout, stderr)
+        # return (cmd.stdout, stderr) == ("", "")
 
     @property
     def is_masked(self):
-        cmd = self.run_test("systemctl is-enabled %s", self.name)
+        cmd = self.run_test("systemctl is-enabled -- %s", self.name)
         return cmd.stdout.strip() == "masked"
 
     @functools.cached_property
     def systemd_properties(self):
-        out = self.check_output("systemctl show %s", self.name)
+        out = self.check_output("systemctl show -- %s", self.name)
         out_d = {}
         if out:
             # maxsplit is required because values can contain `=`