From 7d62c3f9f4335d91323d1de0843790e498ab13fd Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 27 Jul 2014 20:16:36 +0100 Subject: Use systemctl preset rather than enable. This will use the package preset rules rather than hardcoding enabling which allows use to separate policy from action. We should really update msec to write out /etc/systemd/system-preset/*.preset file according to the current system level. This would replace our parsing of /etc/security/msec/server file (which is a symlink) in these scripts and would allow administrators (or just the security level itself) to dictate whether newly installed services are enabled or not when installed. --- NEWS | 1 + add-service | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 5d850a5..27bcc3c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,4 @@ + * use systemctl preset rather than enable to respect preset configuration * drop hacky workaround for systemd reload on sysv initscript package removal as a filetrigger with appropriate matching will suffice fine here * drop systemd migration scripts we never used diff --git a/add-service b/add-service index 684d3db..6314c76 100755 --- a/add-service +++ b/add-service @@ -128,7 +128,7 @@ add_service() { # Actually do enable/disable foo if [ -n "$units_to_enable" ]; then - /bin/systemctl --quiet enable $units_to_enable >/dev/null + /bin/systemctl --quiet preset $units_to_enable >/dev/null if [ -n "$srv" -a ! -f "${systemd_migration_dir}/$srv" ]; then touch "${systemd_migration_dir}/$srv" fi -- cgit v1.2.1