Merge pull request #1815 from dalto8/timer

[services-systemd] Add support for timers

src/modules/services-systemd/main.py

@@ -63,6 +63,8 @@ def systemctl(targets, command, suffix):
                     description = _("Cannot enable systemd service <code>{name!s}</code>.")
                 elif command == "enable" and suffix == ".target":
                     description = _("Cannot enable systemd target <code>{name!s}</code>.")
+                elif command == "enable" and suffix == ".timer":
+                    description = _("Cannot enable systemd timer <code>{name!s}</code>.")
                 elif command == "disable" and suffix == ".service":
                     description = _("Cannot enable systemd service <code>{name!s}</code>.")
                 elif command == "disable" and suffix == ".target":
@@ -97,6 +99,10 @@ def run():
     if r is not None:
         return r
 
+    r = systemctl(cfg.get("timers", []), "enable", ".timer")
+    if r is not None:
+        return r
+
     r = systemctl(cfg.get("disable", []), "disable", ".service")
     if r is not None:
         return r

src/modules/services-systemd/services-systemd.conf

@@ -3,24 +3,24 @@
 #
 # Systemd services manipulation.
 #
-# This module can enable services and targets for systemd
-# (if packaging doesn't already do that). It can calso
-# disable services (but not targets).
+# This module can enable services, timers and targets for systemd
+# (if packaging doesn't already do that). It can also
+# disable services and targets as well as mask units.
 #
-# First, services are enabled; then targets; then services
-# are disabled -- this order of operations is fixed.
+# The order of operations is fixed.  Enable services, enable targets,
+# enable timers, disable services, disable targets and finally apply masks.
 ---
 
-# There are three configuration keys for this module:
-# *services*, *targets* and *disable*. The value of each
-# key is a list of entries. Each entry has two keys:
+# There are several configuration keys for this module:
+# *services*, *targets*, *timers*, *disable*, *disable-targets* and *mask*.
+# The value of each key is a list of entries. Each entry has two keys:
 #   - *name* is the (string) name of the service or target that is being
-#     changed. Use quotes. Don't include ".target" or ".service"
-#     in the name.
+#     changed. Use quotes. Don't include unit suffix in the name. For
+#     example, it should be "NetworkManager", not "NetworkManager.service"
 #   - *mandatory* is a boolean option, which states whether the change
 #     must be done successfully. If systemd reports an error while changing
 #     a mandatory entry, the installation will fail. When mandatory is false,
-#     errors for that entry (service or target) are ignored. If mandatory
+#     errors for that systemd unit are ignored. If mandatory
 #     is not specified, the default is false.
 #
 # An entry may also be given as a single string, which is then
@@ -46,6 +46,11 @@
 #   - name: "graphical"
 #     mandatory: true
 #
+# # Enables <name>.timer
+# timers:
+#   - name: "fstrim"
+#     mandatory: false
+#
 # # Disables <name>.service
 # disable:
 #   - name: "pacman-init"
@@ -68,6 +73,7 @@
 # By default, no changes are made.
 services: []
 targets: []
+timers: []
 disable: []
 disable-targets: []
 mask: []