aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-07-27 20:16:36 +0100
committerColin Guthrie <colin@mageia.org>2014-07-27 20:16:36 +0100
commit7d62c3f9f4335d91323d1de0843790e498ab13fd (patch)
tree15e7ff89d05f365a766d974c80116827df0f790f
parent7a7ee261362d61c730196df299a05347a68f9369 (diff)
downloadrpm-helper-7d62c3f9f4335d91323d1de0843790e498ab13fd.tar
rpm-helper-7d62c3f9f4335d91323d1de0843790e498ab13fd.tar.gz
rpm-helper-7d62c3f9f4335d91323d1de0843790e498ab13fd.tar.bz2
rpm-helper-7d62c3f9f4335d91323d1de0843790e498ab13fd.tar.xz
rpm-helper-7d62c3f9f4335d91323d1de0843790e498ab13fd.zip
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.
-rw-r--r--NEWS1
-rwxr-xr-xadd-service2
2 files changed, 2 insertions, 1 deletions
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