Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2015-02-06 22:36:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2015-01-21
21:53:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2015-02-06
22:36:54.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Feb 5 09:37:42 UTC 2015 - meiss...@suse.com
+
+- regenerate the initrds on updating this package (or the -fips
+ subpackage)
+
+-------------------------------------------------------------------
+Sun Feb 1 10:11:29 UTC 2015 - tchva...@suse.com
+
+- Apply patch for systemd-journald SIGTERMing on boot bnc#915575
+ * 0167-do-not-symlink-var-log-to-run-log.patch
+
+-------------------------------------------------------------------
New:
----
0167-do-not-symlink-var-log-to-run-log.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.ayQLBJ/_old 2015-02-06 22:36:57.000000000 +0100
+++ /var/tmp/diff_new_pack.ayQLBJ/_new 2015-02-06 22:36:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dracut
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -188,11 +188,13 @@
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
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
+BuildRequires: suse-module-tools
BuildRequires: pkgconfig(systemd) >= 199
Requires: bash
Requires: coreutils
@@ -398,6 +400,7 @@
%patch164 -p1
%patch165 -p1
%patch166 -p1
+%patch167 -p1
%build
%configure\
@@ -464,12 +467,26 @@
%post
%service_add_post purge-kernels.service
+%{?regenerate_initrd_post}
+
+%post fips
+%{?regenerate_initrd_post}
%preun
%service_del_preun purge-kernels.service
%postun
%service_del_postun purge-kernels.service
+%{?regenerate_initrd_post}
+
+%postun fips
+%{?regenerate_initrd_post}
+
+%posttrans
+%{?regenerate_initrd_posttrans}
+
+%posttrans fips
+%{?regenerate_initrd_posttrans}
%files fips
%defattr(-,root,root,0755)
++++++ 0167-do-not-symlink-var-log-to-run-log.patch ++++++
>From 00529cd63e2c82660208bdd07f9ce4db206d560c Mon Sep 17 00:00:00 2001
From: Harald Hoyer <har...@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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
