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=cabf19b4fdc84fbb426b886f7fc45ee19803c6ef;hb=HEAD;hpb=d55873e3a67289b479ae63f4480f9cb970bea751

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index cabf19b..4b63a99 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -16,52 +16,14 @@ 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"
+  # workaround for #992847 to workaround /lib/systemd -> /usr/lib/systemd transition
+  $ROOTCMD rm -f /etc/systemd/system/syslog.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
 }
 
-file_rc_setup() {
-  if ! [ -r "${target}"/etc/runlevel.conf ] ; then
-     echo 'Warning: /etc/runlevel.conf does not exist...'
-     echo '... assuming we do not have file-rc, skipping 15-initsetup'
-     exit 0
-  fi
-
-  # keep a backup of the original runlevel.conf file for reference
-  if [ -r "${target}"/etc/runlevel.conf.original ] ; then
-    # make sure to store old backup files if they differ as well
-    if ! cmp "${target}"/etc/runlevel.conf "${target}"/etc/runlevel.conf.original >/dev/null ; then
-      cp "${target}"/etc/runlevel.conf.original "${target}/etc/runlevel.conf.original.$(date +%Y%m%d_%k:%M:%S)"
-    fi
-  fi
-
-  cp "${target}"/etc/runlevel.conf "${target}"/etc/runlevel.conf.original
-
-  # provide Grml's default file-rc configuration
-  fcopy -v /etc/runlevel.conf
-
-  # provide Grml's inittab configuration
-  fcopy -v /etc/inittab
-  sed -i "s/\$USERNAME\$/${USERNAME}/" "${target}"/etc/inittab
-
-  # provide Grml's bootlocal init scripts
-  fcopy -v -mroot,root,0755 /etc/init.d/bootlocal.first
-  fcopy -v -mroot,root,0755 /etc/init.d/bootlocal.middle
-  fcopy -v -mroot,root,0755 /etc/init.d/bootlocal.last
-}
-
-if ifclass FILE_RC ; then
-  file_rc_setup
-else
-  systemd_setup
-fi
+systemd_setup
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2