X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F15-initsetup;h=dd074eae0665dbc92f91ee14383ec68298073d44;hb=5a07e4e2155664df5bcc21a1ffee138e079fc133;hp=3cf057c5eeb6078253f4d5571ebe81bb831c5227;hpb=55a97d8c555e1b6ebc96ae08833bf30acbb8a60e;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index 3cf057c..dd074ea 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -16,24 +16,17 @@ 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-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 ->
-
-  # * 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() {