From 0f4da248e7b555a1b3b83dfad23fbcdbb949105b Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Fri, 12 Aug 2022 15:15:11 +0200 Subject: [PATCH] fix installation of systemd service file Signed-off-by: Thomas Oettli --- pyquarantine/_install.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pyquarantine/_install.py b/pyquarantine/_install.py index 671152f..7ad4e6a 100644 --- a/pyquarantine/_install.py +++ b/pyquarantine/_install.py @@ -21,14 +21,18 @@ import shutil import sys -SYSTEMD_PATH = "/lib/systemd/system" +SYSTEMD_PATHS = ["/lib/systemd/system", "/usr/lib/systemd/system"] OPENRC = "/sbin/openrc" def _systemd_files(pkg_dir, name): + for path in SYSTEMD_PATHS: + if os.path.isdir(path): + break + return [ (f"{pkg_dir}/misc/systemd/{name}-milter.service", - f"{SYSTEMD_PATH}/{name}-milter.service", True)] + f"{path}/{name}-milter.service", True)] def _openrc_files(pkg_dir, name): @@ -117,7 +121,11 @@ def _check_root(): def _check_systemd(): - systemd = os.path.isdir(SYSTEMD_PATH) + for path in SYSTEMD_PATHS: + systemd = os.path.isdir(path) + if systemd: + break + if systemd: logging.info("systemd detected")