From: Darshaka Pathirana <dpat@syn-net.org>
Date: Sun, 25 Dec 2016 13:03:24 +0000 (+0100)
Subject: Use systemd.preset to disable all unneeded services
X-Git-Tag: v0.28.0~7
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=55a97d8c555e1b6ebc96ae08833bf30acbb8a60e

Use systemd.preset to disable all unneeded services

We decided to disable all services by default and only enable the ones
we really need. Currently only getty, grml-autoconfig and the
debug-shell are enabled.
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index 4d9acfc..3cf057c 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -16,20 +16,16 @@ systemd_setup() {
   echo "Enabling user '$USERNAME' for autologin"
   sed -i "s/\$USERNAME/$USERNAME/" "$target"/etc/systemd/system/getty@tty*.service.d/override.conf
 
-  # FIXME - ssh-keygen isn't executed yet before ssh-bootoption + ssh services
-  $ROOTCMD systemctl enable ssh-bootoption.service || echo "failed to enable ssh-bootoption.service"
-  $ROOTCMD systemctl enable ssh-keygen.service     || echo "failed to enable ssh-keygen.service"
+  # FIXME - ssh-bootoption is currently broken
+  # $ROOTCMD systemctl enable ssh-bootoption.service || echo "failed to enable ssh-bootoption.service"
 
   # fails on overlayfs with
   # "Failed to unmount transient /etc/machine-id file in our private namespace: Invalid argument"
   $ROOTCMD systemctl mask systemd-machine-id-commit.service || echo "failed to mask $systemd-machine-id-commit.service"
+  $ROOTCMD systemctl preset-all
 
   # TODO ->
 
-  # * *proper* integration for grml-autoconfig
-      $ROOTCMD systemctl enable grml-autoconfig.service || echo "failed to enable grml-autoconfig.service"
-      ln -sf /etc/systemd/system/grml-autoconfig.service "${target}"/etc/systemd/system/multi-user.target.wants/grml-autoconfig.service
-
   # * avoid startup of any LSB scripts; NOTE: jessie doesn't support that
   #   system-generators approach yet, only >=stretch
       mkdir -p "${target}"/etc/systemd/system-generators/