Provide workaround for systemd's systemctl failures on jessie

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 15-initsetup

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index cabf19b..dd074ea 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -16,15 +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
-
-  $ROOTCMD systemctl set-default grml-boot.target
+  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() {