SW: add f2fs-tools to GRML_SMALL + GRML_FULL

[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 1e8a824..459e51a 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -16,8 +16,20 @@ systemd_setup() {
   echo "Enabling user '$USERNAME' for autologin"
   sed -i "s/\$USERNAME/$USERNAME/" "$target"/etc/systemd/system/getty@tty*.service.d/override.conf
 
-  $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
+      ;;
+    *)
+      # workaround for #992847 to workaround /lib/systemd -> /usr/lib/systemd transition
+      $ROOTCMD rm -f /etc/systemd/system/syslog.service
+
+      $ROOTCMD systemctl preset-all
+      $ROOTCMD systemctl set-default grml-boot.target
+      ;;
+  esac
 }
 
 file_rc_setup() {