up to 245.7

[packages/systemd.git] / systemd-configfs.patch

diff --git a/systemd-configfs.patch b/systemd-configfs.patch
index c891c16a1c54180683058f46f3e284a83b84d288..345f35ee24bf29cd2f01a99be7bbf3234ad853fb 100644 (file)
--- a/systemd-configfs.patch
+++ b/systemd-configfs.patch
@@ -1,30 +1,22 @@
-diff -durN -x '*.orig' systemd-208.orig/Makefile.am systemd-208/Makefile.am
---- systemd-208.orig/Makefile.am       2014-01-10 10:21:40.000000000 +0100
-+++ systemd-208/Makefile.am    2014-01-10 10:22:33.000000000 +0100
-@@ -411,6 +411,7 @@
-       units/syslog.socket \
-       units/dev-hugepages.mount \
-       units/dev-mqueue.mount \
-+      units/sys-kernel-config.service \
-       units/sys-kernel-config.mount \
-       units/sys-kernel-debug.mount \
-       units/sys-fs-fuse-connections.mount \
-@@ -4435,7 +4436,6 @@
- SYSINIT_TARGET_WANTS += \
-       dev-hugepages.mount \
-       dev-mqueue.mount \
--      sys-kernel-config.mount \
-       sys-kernel-debug.mount \
-       sys-fs-fuse-connections.mount \
-       systemd-sysctl.service \
+--- systemd-235/units/meson.build.org  2017-10-21 15:20:03.280741248 +0200
++++ systemd-235/units/meson.build      2017-10-21 15:20:23.741288778 +0200
+@@ -76,6 +76,7 @@ units = [
+          'sysinit.target.wants/'],
+         ['sys-kernel-config.mount',             '',
+          'sysinit.target.wants/'],
++        ['sys-kernel-config.service',           ''],
+         ['sys-kernel-debug.mount',              '',
+          'sysinit.target.wants/'],
+         ['sys-kernel-tracing.mount',            '',
 diff -durN -x '*.orig' systemd-208.orig/units/sys-kernel-config.mount systemd-208/units/sys-kernel-config.mount
 --- systemd-208.orig/units/sys-kernel-config.mount     2013-08-13 22:02:52.000000000 +0200
 +++ systemd-208/units/sys-kernel-config.mount  2014-01-10 10:22:04.000000000 +0100
-@@ -10,8 +10,8 @@
+@@ -10,9 +10,9 @@ Description=Configuration File System
  Documentation=https://www.kernel.org/doc/Documentation/filesystems/configfs/configfs.txt
  Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
  DefaultDependencies=no
 -ConditionPathExists=/sys/kernel/config
+ ConditionCapability=CAP_SYS_RAWIO
 -After=systemd-modules-load.service
 +Wants=sys-kernel-config.service
 +After=systemd-modules-load.service sys-kernel-config.service