From ef54de79311ec3909f1268d6528ca89b7ec298f2 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Feb 22 2021 19:04:31 +0000 Subject: prevent other services from starting (due to systemd dependencies) by masking them --- diff --git a/root/README.md b/root/README.md index 8b86925..1874e84 100644 --- a/root/README.md +++ b/root/README.md @@ -60,11 +60,18 @@ $ podman run -d \ --name pmlogger \ --systemd always \ -e PCP_SERVICES=pmlogger \ - -v $(pwd)/pmlogger.control:/etc/pcp/pmlogger/control.d/local \ + -v $(pwd)/pmlogger.control:/etc/pcp/pmlogger/control.d/local:z \ -v pcp-archives:/var/log/pcp/pmlogger \ registry.fedoraproject.org/pcp ``` +pmlogger.control: +``` +$version=1.1 + +remote.pmcdhost.corp n n PCP_ARCHIVE_DIR/remote_pmcd -N -r -T24h10m -c config.default -v 100Mb +``` + ## Volumes ### `/var/log/pcp/pmlogger` diff --git a/root/usr/bin/container-entrypoint b/root/usr/bin/container-entrypoint index a10c34f..fbdf445 100755 --- a/root/usr/bin/container-entrypoint +++ b/root/usr/bin/container-entrypoint @@ -15,10 +15,12 @@ envsubst '$REDIS_SERVERS' < /usr/share/container-scripts/pcp/pmproxy.conf.templa echo "Enabling PCP services: ${PCP_SERVICES}" for service in ${ALL_PCP_SERVICES//,/ }; do if [[ ",${PCP_SERVICES}," = *",${service},"* ]]; then - systemctl enable "${service}" &> /dev/null + systemctl enable "${service}" 2> /dev/null else # pcp-zeroconf enables some PCP services already -> disable them if not requested - systemctl disable "${service}" &> /dev/null + systemctl disable "${service}" 2> /dev/null + # prevent other services from starting (due to systemd dependencies) by masking them + systemctl mask "${service}" 2> /dev/null fi done