Accepting request 265388 from home:tsaupe:branches:Base:System

use --boot option in systemd-tmpfiles-setup-dev.service (bnc#908476)

OBS-URL: https://build.opensuse.org/request/show/265388
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=835

0001-units-tmpfiles-setup-dev-allow-unsafe-file-creation-.patch

@@ -0,0 +1,24 @@
+From 8c94052ee543c3598a3c7b0c46688150aa2c6168 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Mon, 27 Oct 2014 17:15:42 +0100
+Subject: [PATCH 1/2] units: tmpfiles-setup-dev - allow unsafe file creation to
+ happen in /dev at boot
+
+This will allow us to mark static device nodes with '!' to indicate that they should only be created at early boot.
+---
+ units/systemd-tmpfiles-setup-dev.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in
+index f3833fd..0123a03 100644
+--- a/units/systemd-tmpfiles-setup-dev.service.in
++++ b/units/systemd-tmpfiles-setup-dev.service.in
+@@ -17,4 +17,4 @@ ConditionCapability=CAP_SYS_MODULE
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create
++ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create --boot
+-- 
+2.1.2
+

0002-man-tmpfiles.d-recommend-using-b-and-c.patch

@@ -0,0 +1,24 @@
+diff -Naur systemd-210/man/tmpfiles.d.xml systemd-210-mod/man/tmpfiles.d.xml
+--- systemd-210/man/tmpfiles.d.xml	2014-12-16 10:16:51.269189374 +0100
++++ systemd-210-mod/man/tmpfiles.d.xml	2014-12-16 10:39:49.937552189 +0100
+@@ -158,12 +158,18 @@
+ 
+                                 <varlistentry>
+                                         <term><varname>c</varname></term>
+-                                        <listitem><para>Create a character device node if it does not exist yet.</para></listitem>
++                                        <listitem><para>Create a character device node if it does not exist yet. 
++                                            It is recommended to suffix this entry with an exclamation mark to only 
++                                            create static device nodes at boot, as udev will not manage static device 
++                                            nodes that are created at runtime.</para></listitem>
+                                 </varlistentry>
+ 
+                                 <varlistentry>
+                                         <term><varname>b</varname></term>
+-                                        <listitem><para>Create a block device node if it does not exist yet.</para></listitem>
++                                        <listitem><para>Create a block device node if it does not exist yet.
++                                            It is recommended to suffix this entry with an exclamation mark to only 
++                                            create static device nodes at boot, as udev will not manage static device 
++                                            nodes that re created at runtime.</para></listitem>
+                                 </varlistentry>
+ 
+                                 <varlistentry>

systemd-mini.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec 16 09:45:38 UTC 2014 - thomas.blume@suse.com
+
+- use --boot option in systemd-tmpfiles-setup-dev.service (bnc#908476)
+  add upstream patches:
+  0001-units-tmpfiles-setup-dev-allow-unsafe-file-creation-.patch
+  0002-man-tmpfiles.d-recommend-using-b-and-c.patch (adapted)
+
 -------------------------------------------------------------------
 Tue Dec 16 08:59:08 UTC 2014 - werner@suse.de
 

systemd-mini.spec

@@ -1058,6 +1058,10 @@ Patch515:       0002-systemctl-show-BindsTo-BoundBy-in-list-dependencies.patch
 Patch516:       0003-cryptsetup-default-to-no-hash-when-keyfile-is-specif.patch
 # PATCH-FIX-UPSTREAM added at 2014/12/15
 Patch517:       0004-core-fix-transaction-destructiveness-check-once-more.patch
+# PATCH-FIX-UPSTREAM added at 2014/12/16
+Patch518:       0001-units-tmpfiles-setup-dev-allow-unsafe-file-creation-.patch
+# PATCH-FIX-UPSTREAM added at 2014/12/16
+Patch519:       0002-man-tmpfiles.d-recommend-using-b-and-c.patch
 
 # UDEV PATCHES
 # ============
@@ -1937,6 +1941,8 @@ cp %{SOURCE7} m4/
 %patch515 -p0
 %patch516 -p0
 %patch517 -p0
+%patch518 -p1
+%patch519 -p1
 
 # udev patches
 %patch1001 -p1

systemd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec 16 09:45:38 UTC 2014 - thomas.blume@suse.com
+
+- use --boot option in systemd-tmpfiles-setup-dev.service (bnc#908476)
+  add upstream patches:
+  0001-units-tmpfiles-setup-dev-allow-unsafe-file-creation-.patch
+  0002-man-tmpfiles.d-recommend-using-b-and-c.patch (adapted)
+
 -------------------------------------------------------------------
 Tue Dec 16 08:59:08 UTC 2014 - werner@suse.de
 

systemd.spec

@@ -1053,6 +1053,10 @@ Patch515:       0002-systemctl-show-BindsTo-BoundBy-in-list-dependencies.patch
 Patch516:       0003-cryptsetup-default-to-no-hash-when-keyfile-is-specif.patch
 # PATCH-FIX-UPSTREAM added at 2014/12/15
 Patch517:       0004-core-fix-transaction-destructiveness-check-once-more.patch
+# PATCH-FIX-UPSTREAM added at 2014/12/16
+Patch518:       0001-units-tmpfiles-setup-dev-allow-unsafe-file-creation-.patch
+# PATCH-FIX-UPSTREAM added at 2014/12/16
+Patch519:       0002-man-tmpfiles.d-recommend-using-b-and-c.patch
 
 # UDEV PATCHES
 # ============
@@ -1932,6 +1936,8 @@ cp %{SOURCE7} m4/
 %patch515 -p0
 %patch516 -p0
 %patch517 -p0
+%patch518 -p1
+%patch519 -p1
 
 # udev patches
 %patch1001 -p1