X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F15-initsetup;h=dd074eae0665dbc92f91ee14383ec68298073d44;hp=ba2990807b7c3fc44717bd8168a5fe3287364aeb;hb=40b0557155a1203823d820af0b7bef21af037cd2;hpb=6e61fc1fc4b79cc4506783c03e441a3686d287d2

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index ba29908..dd074ea 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -11,33 +11,22 @@ 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
 
-  # 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"
-
-  # 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"
-
-  # 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
+  case "$(cat "${target}"/etc/debian_version)" in
+    8.*)
+      echo "Debian jessie detected. Enabling workaround for unknown systemctl preset-all/set-default exit failure."
+      $ROOTCMD systemctl preset-all || true
+      $ROOTCMD systemctl set-default grml-boot.target || true
+      ;;
+    *)
+      $ROOTCMD systemctl preset-all
+      $ROOTCMD systemctl set-default grml-boot.target
+      ;;
+  esac
 }
 
 file_rc_setup() {