[libvirt] [PATCH] Use global directory as UML's monitorDir for privileged connections

For privileged UML connections (uml:///system), we shouldn't use root's home dir, but rather somewhre in /var/run/libvirt/uml. https://bugzilla.redhat.com/show_bug.cgi?id=499536 Signed-off-by: Soren Hansen <soren(a)linux2go.dk&gt; --- src/uml/uml_driver.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 8b129b7..c8b9997 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -373,6 +373,10 @@ umlStartup(int privileged) { if ((base = strdup (SYSCONF_DIR "/libvirt")) == NULL) goto out_of_memory; + + if (virAsprintf(&uml_driver->monitorDir, + "%s/run/libvirt/uml", LOCAL_STATE_DIR) == -1) + goto out_of_memory; } else { if (virAsprintf(&uml_driver->logDir, @@ -381,11 +385,11 @@ umlStartup(int privileged) { if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) goto out_of_memory; - } - if (virAsprintf(&uml_driver->monitorDir, - "%s/.uml", userdir) == -1) - goto out_of_memory; + if (virAsprintf(&uml_driver->monitorDir, + "%s/.uml", userdir) == -1) + goto out_of_memory; + } /* Configuration paths are either ~/.libvirt/uml/... (session) or * /etc/libvirt/uml/... (system). -- 1.7.0.4