diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-10-08 20:22:40 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-10-08 20:22:40 +0100 |
| commit | b94f44cf1458983b798426f6e9d038b6768eae9f (patch) | |
| tree | d40664e2650ca5e4b853bc683f293886a8f25ecc | |
| parent | b289b717a84396801bda6b0949cabbdb8299328d (diff) | |
| download | rpm-helper-b94f44cf1458983b798426f6e9d038b6768eae9f.tar rpm-helper-b94f44cf1458983b798426f6e9d038b6768eae9f.tar.gz rpm-helper-b94f44cf1458983b798426f6e9d038b6768eae9f.tar.bz2 rpm-helper-b94f44cf1458983b798426f6e9d038b6768eae9f.tar.xz rpm-helper-b94f44cf1458983b798426f6e9d038b6768eae9f.zip | |
Use systemctl enable if preset fails (which it will for sysvinit)
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | add-service | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,5 @@ + * use systemctl enable if preset fails (which it will for sysvinit) + 2014-07-27 Colin Guthrie <colin@mageia.org> 0.24.12 * use systemctl preset rather than enable to respect preset configuration * drop hacky workaround for systemd reload on sysv initscript package removal diff --git a/add-service b/add-service index 04eb865..880bd2e 100755 --- a/add-service +++ b/add-service @@ -128,7 +128,8 @@ add_service() { # Actually do enable/disable foo if [ -n "$units_to_enable" ]; then - /bin/systemctl --quiet preset $units_to_enable >/dev/null + # Prefer preset (for native systemd units), but fall back to enable (for sysvinit units) + /bin/systemctl --quiet preset $units_to_enable >/dev/null || /bin/systemctl --quiet enable $units_to_enable >/dev/null if [ -n "$srv" -a ! -f "${systemd_migration_dir}/$srv" ]; then touch "${systemd_migration_dir}/$srv" fi |