Adding upstream version 060+5.upstream/060+5

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 81 insertions, 0 deletions

diff --git a/modules.d/01systemd-journald/initrd.conf b/modules.d/01systemd-journald/initrd.conf
new file mode 100644
index 0000000..1246e05
--- /dev/null
+++ b/modules.d/01systemd-journald/initrd.conf
@@ -0,0 +1,9 @@
+# This file is part of dracut systemd-journal module.
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Dracut requires volatile journal without rate-limiting
+
+[Journal]
+Storage=volatile
+RateLimitInterval=0
+RateLimitBurst=0
diff --git a/modules.d/01systemd-journald/module-setup.sh b/modules.d/01systemd-journald/module-setup.sh
new file mode 100755
index 0000000..3cf2a1a
--- /dev/null
+++ b/modules.d/01systemd-journald/module-setup.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+# This file is part of dracut.
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Prerequisite check(s) for module.
+check() {
+
+    # If the binary(s) requirements are not fulfilled the module can't be installed.
+    require_binaries \
+        journalctl \
+        "$systemdutildir"/systemd-journald \
+        || return 1
+
+    # Return 255 to only include the module, if another module requires it.
+    return 255
+
+}
+
+# Module dependency requirements.
+depends() {
+
+    # This module has external dependency on other module(s).
+    echo systemd-sysusers
+    # Return 0 to include the dependent module(s) in the initramfs.
+    return 0
+
+}
+
+# Install the required file(s) and directories for the module in the initramfs.
+install() {
+
+    inst_simple "$moddir/initrd.conf" "$systemdutildir/journald.conf.d/initrd.conf"
+
+    inst_multiple -o \
+        "$systemdutildir"/journald.conf \
+        "$systemdutildir/journald.conf.d/*.conf" \
+        "$systemdutildir"/systemd-journald \
+        "$systemdsystemunitdir"/systemd-journald.service \
+        "$systemdsystemunitdir"/systemd-journald.socket \
+        "$systemdsystemunitdir"/systemd-journald@.service \
+        "$systemdsystemunitdir"/systemd-journald@.socket \
+        "$systemdsystemunitdir"/systemd-journald-audit.socket \
+        "$systemdsystemunitdir"/systemd-journald-dev-log.socket \
+        "$systemdsystemunitdir"/systemd-journald-varlink@.socket \
+        "$systemdsystemunitdir"/systemd-journal-catalog-update.service \
+        "$systemdsystemunitdir"/sockets.target.wants/systemd-journald-audit.socket \
+        "$systemdsystemunitdir"/sockets.target.wants/systemd-journald-dev-log.socket \
+        "$systemdsystemunitdir"/sockets.target.wants/systemd-journald.socket \
+        "$systemdsystemunitdir"/sysinit.target.wants/systemd-journald.service \
+        "$sysusers"/systemd-journal.conf \
+        journalctl
+
+    # Install library file(s)
+    _arch=${DRACUT_ARCH:-$(uname -m)}
+    inst_libdir_file \
+        {"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \
+        {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*" \
+        {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*"
+
+    # Install the hosts local user configurations if enabled.
+    if [[ $hostonly ]]; then
+        inst_multiple -H -o \
+            "$systemdutilconfdir"/journald.conf \
+            "$systemdutilconfdir/journald.conf.d/*.conf" \
+            "$systemdsystemconfdir"/systemd-journald.service \
+            "$systemdsystemconfdir/systemd-journald.service.d/*.conf" \
+            "$systemdsystemconfdir"/systemd-journal-catalog-update.service \
+            "$systemdsystemconfdir/systemd-journal-catalog-update.service.d/*.conf" \
+            "$sysusersconfdir"/systemd-journal.conf
+    fi
+
+}