summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-04-17 09:38:19 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-04-17 09:43:36 +0100
commit879d58f65a99c5f73608c1fa16d1fca7f46dbb99 (patch)
tree69fddb0567399ae1268bc69bfd895e7aca294193 /draklive
parentc3a217af744ac08620d0db73ce651600032b2ef1 (diff)
downloaddrakiso-879d58f65a99c5f73608c1fa16d1fca7f46dbb99.tar
drakiso-879d58f65a99c5f73608c1fa16d1fca7f46dbb99.tar.gz
drakiso-879d58f65a99c5f73608c1fa16d1fca7f46dbb99.tar.bz2
drakiso-879d58f65a99c5f73608c1fa16d1fca7f46dbb99.tar.xz
drakiso-879d58f65a99c5f73608c1fa16d1fca7f46dbb99.zip
Use systemctl instead of chkconfig to disable services.
This allows both systemd and sysv services to be disabled. Also add support for disabling systemd timers.
Diffstat (limited to 'draklive')
-rwxr-xr-xdraklive3
1 files changed, 2 insertions, 1 deletions
diff --git a/draklive b/draklive
index 48b7e85..27bbbde 100755
--- a/draklive
+++ b/draklive
@@ -282,7 +282,8 @@ sub post_install_system {
run_({ root => $live->get_system_root, targetarch => $live->{settings}{arch} },
'sh', '-c', "rpm -qa $erase | xargs rpm -e ") if $erase;
- run_({ root => $live->get_system_root }, 'chkconfig', '--del', $_) foreach @{$live->{system}{disable_services}};
+ run_({ root => $live->get_system_root }, 'systemctl', 'disable', $_ . '.service') foreach @{$live->{system}{disable_services}};
+ run_({ root => $live->get_system_root }, 'systemctl', 'disable', $_ . '.timer') foreach @{$live->{system}{disable_timers}};
#- make sure harddrake is run:
#- if previous HW config file is empty, we assumes DrakX has just completed the installation