From 0184cb6fb24c7953d504a42080cf00ba4b987645 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 17 Apr 2017 10:43:52 +0100
Subject: Update list of services to disable and list of services to reenable.

Drop items that no longer exist or are not installed. Leave cupsd
enabled, because s-c-p doesn't work if it's disabled.

draklive now supports disabling systemd services & timers, so we
no longer need to handle these separately.
---
 config/live.cfg                   | 27 ++++++++++-----------------
 files/draklive-install.d/services |  2 --
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/config/live.cfg b/config/live.cfg
index 1a80d40..bd804bf 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -131,18 +131,16 @@ my $_l = {
         rpms => [
         ],
         disable_services => [
-            qw(bluetooth laptop-mode pcmcia mdadm pcscd),
-            qw(cups hplip oki4daemon),     # printing
-            qw(capi4linux ibod isdn4linux isdnlog bpalogin),
-            qw(cpqarrayd upsd upsmon), # uncommon hardware
-            qw(lisa ntpd snmpd), # unneeded software
-            qw(dkms),           # slows down live boot, reenabled after install
-            qw(anacron crond), # slows down basic usage and install, reenabled after install
-            qw(sshd msec),
-            qw(hcfpci hsf slmodemd),
-            qw(portmap nfs-common),
-            qw(kav4ws freshclam clamd),
-	    if_(member($live->{settings}{media}, 'CD', 'DVD'), preload),
+	    # uncommon hardware
+	    qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd),
+	    # unneeded software
+	    qw(chronyd ntpd snmpd),
+	    # slows down basic usage and install, reenabled after install
+	    qw(crond msec),
+        ],
+        disable_timers => [
+	    # uses too much memory
+	    qw(dnf-makecache),
         ],
         vga_mode => 788,
         gfxboot => $live->{settings}{media} ne 'usb', #- disable gfxboot on USB, buggy with grub on some systems
@@ -219,11 +217,6 @@ my $_l = {
                             "urpmi.addmedia 'Live Core' /var/local/mga_rpms/core with media_info/hdlist.cz",
                             "urpmi.addmedia 'Live Nonfree' /var/local/mga_rpms/nonfree with media_info/hdlist.cz",
 
-                            # TODO: fix draklive so we can use the disable_services section for this
-                            # disable dnf-makecache - it uses too much memory in a Live system
-                            "systemctl disable dnf-makecache.service",
-                            "systemctl disable dnf-makecache.timer",
-
                             # disable HPLIP systray startup
 			    "echo 'Hidden=true' >> /etc/xdg/autostart/hplip-systray.desktop",
 
diff --git a/files/draklive-install.d/services b/files/draklive-install.d/services
index e8190db..8a4c0de 100644
--- a/files/draklive-install.d/services
+++ b/files/draklive-install.d/services
@@ -1,4 +1,2 @@
-anacron
 crond
-dkms
 msec
-- 
cgit v1.2.1