From 99d4fd6bb791ca8ce07e07e13b58445f3e20894a Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Mon, 1 Dec 2014 12:36:20 +0100

Subject: [PATCH] do not symlink /var/log to /run/log

some programs e.g. systemd-journald expect a directory in /var/log as

the marker to do some actions. Here journald tries to flush

/run/log/journal to /var/log/journal, if the directory is seen.

/var/log is now a symlink to /run/initramfs/log.

---

 dracut.sh                                | 1 -

 modules.d/98systemd/dracut-tmpfiles.conf | 3 +++

 modules.d/98systemd/module-setup.sh      | 5 +++++

 modules.d/99base/dracut-lib.sh           | 6 +++++-

 4 files changed, 13 insertions(+), 2 deletions(-)

 create mode 100644 modules.d/98systemd/dracut-tmpfiles.conf

diff --git a/dracut.sh b/dracut.sh

index 2357987..a542f33 100755

--- a/dracut.sh

+++ b/dracut.sh

@@ -1300,7 +1300,6 @@ if [[ $kernel_only != yes ]]; then

     ln -sfn ../run "$initdir/var/run"

     ln -sfn ../run/lock "$initdir/var/lock"

-    ln -sfn ../run/log "$initdir/var/log"

 else

     for d in lib "$libdir"; do

         [[ -e "${initdir}${prefix}/$d" ]] && continue

diff --git a/modules.d/98systemd/dracut-tmpfiles.conf b/modules.d/98systemd/dracut-tmpfiles.conf

new file mode 100644

index 0000000..3c21ce8

--- /dev/null

+++ b/modules.d/98systemd/dracut-tmpfiles.conf

@@ -0,0 +1,3 @@

+d /run/initramfs     0755 root root -

+d /run/initramfs/log 0755 root root -

+L /var/log           -    -    -    - ../run/initramfs/log

diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh

index bd4433e..8052984 100755

--- a/modules.d/98systemd/module-setup.sh

+++ b/modules.d/98systemd/module-setup.sh

@@ -123,6 +123,8 @@ install() {

         $systemdsystemunitdir/slices.target \

         $systemdsystemunitdir/system.slice \

         \

+        $tmpfilesdir/systemd.conf \

+        \

         journalctl systemctl echo swapoff systemd-cgls systemd-tmpfiles

     inst_multiple -o \

@@ -232,6 +234,9 @@ install() {

         ln_r "$systemdsystemunitdir/${i}" "$systemdsystemunitdir/initrd.target.wants/${i}"

     done

+    inst_simple "$moddir/dracut-tmpfiles.conf" "$tmpfilesdir/dracut-tmpfiles.conf"

+

+

     mkdir -p "$initdir/etc/systemd"

     # turn off RateLimit for journal

     {

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh

index 8bc6b26..0a89cc8 100755

--- a/modules.d/99base/dracut-lib.sh

+++ b/modules.d/99base/dracut-lib.sh

@@ -6,7 +6,11 @@ if [ -n "$NEWROOT" ]; then

     [ -d $NEWROOT ] || mkdir -p -m 0755 $NEWROOT

 fi

-[ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs

+if ! [ -d /run/initramfs ]; then

+    mkdir -p -m 0755 /run/initramfs/log

+    ln -sfn /run/initramfs/log /var/log

+fi

+

 [ -d /run/lock ] || mkdir -p -m 0755 /run/lock

 [ -d /run/log ] || mkdir -p -m 0755 /run/log