From 669e843a89a17496e4389e2810769a1c4409aa23 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 7 Feb 2012 04:29:39 +0100
Subject: [PATCH] new upstream

---
 .gitignore   |  1 +
 sources      |  2 +-
 systemd.spec | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e732140..889f678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ systemd-*src.rpm
 /systemd-38.tar.xz
 /systemd-git9fa2f41.tar.xz
 /systemd-39.tar.xz
+/systemd-40.tar.xz
diff --git a/sources b/sources
index 4c2dc87..4b8dd5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7179b34f6f6553d2a36551ac1dec5f0d  systemd-39.tar.xz
+8880180f54dac8618ef70c46492fd8d9  systemd-40.tar.xz
diff --git a/systemd.spec b/systemd.spec
index aff4561..5e805ce 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -2,8 +2,8 @@
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        39
-Release:        3%{?gitcommit:.git%{gitcommit}}%{?dist}
+Version:        40
+Release:        1%{?gitcommit:.git%{gitcommit}}%{?dist}
 License:        GPLv2+
 Group:          System Environment/Base
 Summary:        A System and Service Manager
@@ -197,6 +197,9 @@ install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rsyslog.d/
 # journal.
 rm -f %{buildroot}%{_prefix}/lib/sysctl.d/coredump.conf
 
+# Let rsyslog read from /proc/kmsg for now
+sed -i -e 's/\#ImportKernel=yes/ImportKernel=no/' %{buildroot}%{_sysconfdir}/systemd/systemd-journald.conf
+
 %post
 /sbin/ldconfig
 /bin/systemd-machine-id-setup > /dev/null 2>&1 || :
@@ -390,6 +393,9 @@ fi
 %{_bindir}/systemd-analyze
 
 %changelog
+* Tue Feb  7 2012 Lennart Poettering <lpoetter@redhat.com> - 40-1
+- New upstream release
+
 * Thu Jan 26 2012 Kay Sievers <kay@redhat.com> - 39-3
 - provide /sbin/shutdown