From 6f003b7a94a7352d7b54691d9e0731c6fffa1478 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Sep 02 2015 07:57:22 +0000
Subject: Fix: Document the need to regenerate initrd in order to mask files under /usr (#1256966)


---

diff --git a/0279-man-.d-conf-directories-add-note-about-initrd-regene.patch b/0279-man-.d-conf-directories-add-note-about-initrd-regene.patch
new file mode 100644
index 0000000..ab49ce8
--- /dev/null
+++ b/0279-man-.d-conf-directories-add-note-about-initrd-regene.patch
@@ -0,0 +1,27 @@
+From 2ef555d69a6a6c19897344dd11d7cd3a7c46af64 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 1 Sep 2015 14:21:37 +0200
+Subject: [PATCH] man: *.d conf directories: add note about initrd regeneration
+
+---
+ man/standard-conf.xml | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/man/standard-conf.xml b/man/standard-conf.xml
+index 004f53f..ffc6f76 100644
+--- a/man/standard-conf.xml
++++ b/man/standard-conf.xml
+@@ -30,7 +30,9 @@
+     the vendor, the recommended way is to place a symlink to
+     <filename>/dev/null</filename> in the configuration directory in
+     <filename>/etc/</filename>, with the same filename as the vendor
+-    configuration file.</para>
++    configuration file. If the vendor configuration file is included in
++    the initrd image, the image has to be regenerated.</para>
++
+   </refsection>
+ 
+   <refsection id='main-conf'>
+-- 
+2.4.3
+
diff --git a/systemd.spec b/systemd.spec
index 94934f9..f69e248 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        219
-Release:        22%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        23%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -321,6 +321,7 @@ Patch0275:      0275-logind-rework-display-counting-when-detecting-whethe.patch
 Patch0276:      0276-systemctl-fix-edit-when-EDITOR-contains-arguments.patch
 Patch0277:      0277-sysctl-bump-loglevel-and-reword.patch
 Patch0278:      0278-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch
+Patch0279:      0279-man-.d-conf-directories-add-note-about-initrd-regene.patch
 
 
 # kernel-install patch for grubby, drop if grubby is obsolete
@@ -1166,6 +1167,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 /usr/lib/firewalld/services/*
 
 %changelog
+* Wed Sep  2 2015 Jan Synáček <jsynacek@redhat.com> - 219-23
+- Fix: Document the need to regenerate initrd in order to mask files under /usr (#1256966)
+
 * Tue Sep  1 2015 Jan Synáček <jsynacek@redhat.com> - 219-22
 - Fix: Laptop sometimes doesn't suspend when the lid is closed (#1249822)
 - Fix: systemctl edit falls back to 'nano' when EDITOR contains spaces (#1231949)