units: conditionalize static device node logic on CAP_SYS_MODULES instead of CAP_MKNOD

npsawn containers generally have CAP_MKNOD, since this is required
to make PrviateDevices= work. Thus, it's not useful anymore to
conditionalize the kmod static device node units.

Use CAP_SYS_MODULES instead which is not available for nspawn
containers. However, the static device node logic is only done for being
able to autoload modules with it, and if we can't do that there's no
point in doing it.

(cherry picked from commit e0c74691c4)
(cherry picked from commit fce5e80589)

Conflicts:
	units/systemd-tmpfiles-setup-dev.service.in
This commit is contained in:
Lennart Poettering
2014-07-19 17:24:14 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent bf5aa798d9
commit 734ab69b24
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -9,7 +9,7 @@
Description=Create list of required static device nodes for the current kernel
DefaultDependencies=no
Before=sysinit.target systemd-tmpfiles-setup-dev.service
ConditionCapability=CAP_MKNOD
ConditionCapability=CAP_SYS_MODULE
ConditionPathExists=/lib/modules/%v/modules.devname
[Service]
+1 -1
View File
@@ -10,7 +10,7 @@ Description=Create static device nodes in /dev
Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
DefaultDependencies=no
Before=sysinit.target local-fs-pre.target systemd-udevd.service
ConditionCapability=CAP_MKNOD
ConditionCapability=CAP_SYS_MODULE
[Service]
Type=oneshot