Accepting request 283651 from home:scarabeus_iv:branches:Base:System

- Apply patch for systemd-journald SIGTERMing on boot bnc#915575
  * 0167-do-not-symlink-var-log-to-run-log.patch

OBS-URL: https://build.opensuse.org/request/show/283651
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=205

0167-do-not-symlink-var-log-to-run-log.patch

@@ -0,0 +1,80 @@
+From 00529cd63e2c82660208bdd07f9ce4db206d560c 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.
+
+(cherry picked from commit 99d4fd6bb791ca8ce07e07e13b58445f3e20894a)
+---
+ 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
+
+Index: dracut-037/dracut.sh
+===================================================================
+--- dracut-037.orig/dracut.sh
++++ dracut-037/dracut.sh
+@@ -1286,7 +1286,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
+Index: dracut-037/modules.d/98systemd/dracut-tmpfiles.conf
+===================================================================
+--- /dev/null
++++ dracut-037/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
+Index: dracut-037/modules.d/98systemd/module-setup.sh
+===================================================================
+--- dracut-037.orig/modules.d/98systemd/module-setup.sh
++++ dracut-037/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 \
+@@ -225,6 +227,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
+     {
+Index: dracut-037/modules.d/99base/dracut-lib.sh
+===================================================================
+--- dracut-037.orig/modules.d/99base/dracut-lib.sh
++++ dracut-037/modules.d/99base/dracut-lib.sh
+@@ -8,7 +8,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
+ 

dracut.changes

@@ -4,6 +4,12 @@ Thu Feb  5 09:37:42 UTC 2015 - meissner@suse.com
 - regenerate the initrds on updating this package (or the -fips
   subpackage)
 
+-------------------------------------------------------------------
+Sun Feb  1 10:11:29 UTC 2015 - tchvatal@suse.com
+
+- Apply patch for systemd-journald SIGTERMing on boot bnc#915575
+  * 0167-do-not-symlink-var-log-to-run-log.patch
+
 -------------------------------------------------------------------
 Sat Jan  3 04:53:20 UTC 2015 - bwiedemann@suse.com
 

dracut.spec

@@ -188,6 +188,7 @@ Patch163:       0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch
 Patch164:       0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch
 Patch165:       0165-Order-root-fsck-after-pre-mount.patch
 Patch166:       0166-load-xhci-pci.patch
+Patch167:       0167-do-not-symlink-var-log-to-run-log.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -399,6 +400,7 @@ and its cryptography during startup.
 %patch164 -p1
 %patch165 -p1
 %patch166 -p1
+%patch167 -p1
 
 %build
 %configure\