[packages/systemd] Load the configfs module for /sys/kernel/config mount
jajcus
jajcus at pld-linux.org
Mon Jan 6 12:04:22 CET 2014
commit dd9c7c3ea5b57bedc804dd519c7cd01238213876
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Mon Jan 6 12:00:54 2014 +0100
Load the configfs module for /sys/kernel/config mount
targetcli.service (from the targetcli-fb package) requires
sys-kernel-config.mount unit (configfs mounted at /sys/kernel/config).
With the default systemd-provided units that is started only when
/sys/kernel/config directory extists on boot - that is when configfs is
compiled into kernel or the module is loaded from /etc/modules-load.d
The systemd-configfs.patch changes the behaviour so
sys-kernel-config.mount unit will attempt to load the 'configfs' module
when needed (honouring any module blacklist).
Release: 8
systemd-configfs.patch | 37 +++++++++++++++++++++++++++++++++++++
systemd.spec | 4 +++-
2 files changed, 40 insertions(+), 1 deletion(-)
---
diff --git a/systemd.spec b/systemd.spec
index f49ad5f..46bc75e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@ Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
Version: 208
-Release: 7
+Release: 8
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
@@ -60,6 +60,7 @@ Patch11: nss-in-rootlib.patch
Patch12: proc-hidepid.patch
Patch14: dont-hash-null-keys.patch
Patch15: hibernate-to-file.patch
+Patch16: systemd-configfs.patch
URL: http://www.freedesktop.org/wiki/Software/systemd
BuildRequires: acl-devel
BuildRequires: attr-devel
@@ -592,6 +593,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
# possible cause of infinite loop inside systemd-login
#patch14 -p1
%patch15 -p1
+%patch16 -p1
cp -p %{SOURCE2} src/systemd_booted.c
%build
diff --git a/systemd-configfs.patch b/systemd-configfs.patch
new file mode 100644
index 0000000..c9f6f7c
--- /dev/null
+++ b/systemd-configfs.patch
@@ -0,0 +1,37 @@
+diff -durN systemd-208.orig/Makefile.am systemd-208/Makefile.am
+--- systemd-208.orig/Makefile.am 2014-01-06 11:46:16.758882910 +0100
++++ systemd-208/Makefile.am 2014-01-06 11:45:46.942216959 +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 \
+diff -durN 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.798756199 +0200
++++ systemd-208/units/sys-kernel-config.mount 2014-01-06 11:42:49.095554041 +0100
+@@ -10,8 +10,8 @@
+ 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
+-After=systemd-modules-load.service
++Wants=sys-kernel-config.service
++After=systemd-modules-load.service sys-kernel-config.service
+ Before=sysinit.target
+
+ [Mount]
+diff -durN systemd-208.orig/units/sys-kernel-config.service systemd-208/units/sys-kernel-config.service
+--- systemd-208.orig/units/sys-kernel-config.service 1970-01-01 01:00:00.000000000 +0100
++++ systemd-208/units/sys-kernel-config.service 2014-01-06 11:41:04.962223257 +0100
+@@ -0,0 +1,8 @@
++[Unit]
++Description=Load the configfs module for /sys/kernel/config mount
++ConditionPathExists=!/sys/kernel/config
++DefaultDependencies=no
++
++[Service]
++Type=oneshot
++ExecStart=/sbin/modprobe -b configfs
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/dd9c7c3ea5b57bedc804dd519c7cd01238213876
More information about the pld-cvs-commit
mailing list