From: Michael Prokop <mika@grml.org>
Date: Fri, 12 May 2017 14:35:23 +0000 (+0200)
Subject: No longer mask systemd-machine-id-commit.service
X-Git-Tag: v0.29.4~4
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=2c2f282dacc55193621b539c0069abcc669c384e

No longer mask systemd-machine-id-commit.service

Masking the systemd-machine-id-commit.service causes
all kinds of problems with logins (local as well as via
ssh, causing sloooooow logins). Nowadays the overlayfs
bug also doesn't seem to be present anymore.

Closes grml/grml#27
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index cabf19b..1e8a824 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -16,14 +16,7 @@ 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
 }