Harald Hoyer fe20ad
From cdeb74502d64ea47d1751afc2de82d51ef192c88 Mon Sep 17 00:00:00 2001
Harald Hoyer fe20ad
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Harald Hoyer fe20ad
Date: Mon, 19 Aug 2013 16:59:42 -0400
Harald Hoyer fe20ad
Subject: [PATCH] units: disable kmod-static-nodes.service in containers
Harald Hoyer fe20ad
Harald Hoyer fe20ad
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=998122.
Harald Hoyer fe20ad
Harald Hoyer fe20ad
Note: upstream kmod has a patch [1] to exit with a warning if
Harald Hoyer fe20ad
modules.devname is missing. We could use new %v specifier to make this
Harald Hoyer fe20ad
service conditional on the existence of this file, but this could
Harald Hoyer fe20ad
mask a kernel installation error, hence we should let kmod run
Harald Hoyer fe20ad
even if the file doesn't exist.
Harald Hoyer fe20ad
Harald Hoyer fe20ad
[1] http://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=ae17710117
Harald Hoyer fe20ad
---
Harald Hoyer fe20ad
 units/kmod-static-nodes.service.in | 1 +
Harald Hoyer fe20ad
 1 file changed, 1 insertion(+)
Harald Hoyer fe20ad
Harald Hoyer fe20ad
diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
Harald Hoyer fe20ad
index cdfc6e5..98664ea 100644
Harald Hoyer fe20ad
--- a/units/kmod-static-nodes.service.in
Harald Hoyer fe20ad
+++ b/units/kmod-static-nodes.service.in
Harald Hoyer fe20ad
@@ -9,6 +9,7 @@
Harald Hoyer fe20ad
 Description=Create list of required static device nodes for the current kernel
Harald Hoyer fe20ad
 DefaultDependencies=no
Harald Hoyer fe20ad
 Before=sysinit.target systemd-tmpfiles-setup-dev.service
Harald Hoyer fe20ad
+ConditionVirtualization=!container
Harald Hoyer fe20ad
 
Harald Hoyer fe20ad
 [Service]
Harald Hoyer fe20ad
 Type=oneshot