systemd-knock-221-2: updating version

1 files changed, 22 insertions, 8 deletions

diff --git a/pcr/systemd-knock/systemd.install b/pcr/systemd-knock/systemd.install
index 8957a3336..b0a3e1fa4 100644
--- a/pcr/systemd-knock/systemd.install
+++ b/pcr/systemd-knock/systemd.install
@@ -146,22 +146,34 @@ _216_2_changes() {
   echo '   tuned in /etc/systemd/coredump.conf.'
 }
 
+_219_2_changes() {
+  if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
+    chgrp systemd-journal-remote var/log/journal/remote
+  fi
+}
+
+_219_4_changes() {
+  if ! systemctl is-enabled -q remote-fs.target; then
+    systemctl enable -q remote-fs.target
+  fi
+}
+
 post_install() {
-  # because systemd can't sanely manage this meanial task...
-  uuidgen | {
-    read
-    echo "${REPLY//-}">etc/machine-id
-  }
+  systemd-machine-id-setup
 
   post_common "$@"
 
   add_journal_acls
 
-  # enable getty@tty1 by default, but don't track the file
-  systemctl enable getty@tty1.service
+  # enable some services by default, but don't track them
+  systemctl enable getty@tty1.service remote-fs.target
 
   echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
   echo "   bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
+
+  # group 'systemd-journal-remote' is created by systemd-sysusers
+  mkdir -m2755 var/log/journal/remote
+  chgrp systemd-journal-remote var/log/journal/remote
 }
 
 post_upgrade() {
@@ -179,7 +191,9 @@ post_upgrade() {
                     213-4
                     214-2
                     215-2
-                    216-2)
+                    216-2
+                    219-2
+                    219-4)
 
   for v in "${upgrades[@]}"; do
     if [[ $(vercmp "$v" "$2") -eq 1 ]]; then