[libvirt] [PATCH]lxc: don't always print debug log in lxcContainerSetID

Chen Hanxiao chenhanxiao at cn.fujitsu.com
Wed Oct 16 04:08:34 UTC 2013


From: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>

lxcContainerSetID is used for user namespace.
If we don't enable user namespace, don't print debug log.

Signed-off-by: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
---
 src/lxc/lxc_container.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 56df69e..ed1fe29 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -420,12 +420,14 @@ static int lxcContainerSetID(virDomainDefPtr def)
      * for this container. And user namespace is only enabled
      * when nuidmap&ngidmap is not zero */
 
-    VIR_DEBUG("Set UID/GID to 0/0");
-    if (def->idmap.nuidmap &&
-        virSetUIDGID(0, 0, NULL, 0) < 0) {
-        virReportSystemError(errno, "%s",
-                             _("setuid or setgid failed"));
-        return -1;
+    if (def->idmap.nuidmap) {
+        if (virSetUIDGID(0, 0, NULL, 0) < 0) {
+            virReportSystemError(errno, "%s",
+                                 _("setuid or setgid failed"));
+            return -1;
+        } else {
+            VIR_DEBUG("Set UID/GID to 0/0");
+        }
     }
 
     return 0;
-- 
1.8.2.1




More information about the libvir-list mailing list