X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F15-initsetup;h=cabf19b4fdc84fbb426b886f7fc45ee19803c6ef;hp=f94cd3fa1dd670ef663b3a73a268f88c7e080037;hb=d55873e3a67289b479ae63f4480f9cb970bea751;hpb=1aec7397965ee3164b455cfb763bcc936f65377e

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index f94cd3f..cabf19b 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -11,60 +11,20 @@ set -e
 . "$GRML_LIVE_CONFIG"
 
 systemd_setup() {
-  fcopy -i -B -v -r /etc/systemd
+  fcopy -M -i -B -v -r /etc/systemd
 
   echo "Enabling user '$USERNAME' for autologin"
   sed -i "s/\$USERNAME/$USERNAME/" "$target"/etc/systemd/system/getty@tty*.service.d/override.conf
 
-  # enable TTY logins
-  local service
-  for file in "${target}"/etc/systemd/system/getty@tty*.service.d ; do
-    service=$(basename "$file" .d)
-    $ROOTCMD systemctl enable "$service" || echo "failed to enable $service"
-  done
-  unset service
-
-  # 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
 
-  # disable unwanted services
-  local service
-  for service in \
-    cron.service \
-    lvm2-lvmetad.service \
-    lvm2-lvmetad.socket \
-    lvm2-lvmpolld.socket \
-    lvm2-monitor.service \
-    mdadm-raid.service \
-    smartd.service \
-    ssh.service \
-    swap.target \
-    systemd-timesyncd.service \
-    uuidd.service
-  do
-    $ROOTCMD systemctl disable ${service} || echo "failed to disable $service"
-  done
-  unset service
-
-  # 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/
-      ln -sf /dev/null "${target}"/etc/systemd/system-generators/systemd-sysv-generator
-  #   -> revert /etc/systemd/system-generators/systemd-sysv-generator && systemctl daemon-reload during *bootup*
-  #      + possibly move this into startup so it's always executed on bootup, even with persistency enabled
-  #      where the change towards systemd-sysv-generator might persist across
-  #      reboots -> LSB scripts executed on reboots
+  $ROOTCMD systemctl set-default grml-boot.target
 }
 
 file_rc_setup() {