X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F15-initsetup;h=4b63a99b9fa115238ed6a6a9ce15e0801852fc42;hp=8ee397fd2aa594658e4701c30648cde109a01015;hb=HEAD;hpb=2def18e419f1474c3904672ce297babbb4b9b501

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index 8ee397f..4b63a99 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/15-initsetup
 # Purpose:       configure init system for the live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -8,15 +8,22 @@
 
 set -u
 set -e
+. "$GRML_LIVE_CONFIG"
 
-# if we have a small ISO let's adjust runlevel.conf:
-if [ -n "$GRML_NAME" ] ; then
-   if echo "$GRML_NAME" | grep -q small ; then
-      cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
-   else
-      cp $target/etc/runlevel.conf.livecd $target/etc/runlevel.conf
-   fi
-fi
+systemd_setup() {
+  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
+
+  # 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
+}
+
+systemd_setup
 
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2