|
 |
6ae9ed |
From 03832c723800e942e67bdc15595844b07422c147 Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <03832c723800e942e67bdc15595844b07422c147@dist-git>
|
|
|
6ae9ed |
From: Erik Skultety <eskultet@redhat.com>
|
|
|
6ae9ed |
Date: Tue, 16 Aug 2016 13:06:01 +0200
|
|
|
6ae9ed |
Subject: [PATCH] Revert "admin: Fix the default uri for session daemon to
|
|
|
6ae9ed |
libvirtd:///session"
|
|
|
6ae9ed |
|
|
|
6ae9ed |
The problem is, that the patch fixed the issue in its own way because the
|
|
|
6ae9ed |
original upstream commit 30ce2f0e (which was an incorrect upstream fix anyway)
|
|
|
6ae9ed |
was dependent on commit f5da0d18 which wasn't backported, thus causing
|
|
|
6ae9ed |
conflicts. However, it turned out that f5da0d18 had to be backported
|
|
|
6ae9ed |
eventually, therefore the issue with session daemon uri for virt-admin can be
|
|
|
6ae9ed |
fixed by a proper backport of upstream commit 9e5e7f3a (that fixes 30ce2f0e in
|
|
|
6ae9ed |
upstream).
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1367269
|
|
|
6ae9ed |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/libvirt-admin.c | 8 ++------
|
|
|
6ae9ed |
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
|
|
|
6ae9ed |
index fb2f7b8..f07cb10 100644
|
|
|
6ae9ed |
--- a/src/libvirt-admin.c
|
|
|
6ae9ed |
+++ b/src/libvirt-admin.c
|
|
|
6ae9ed |
@@ -181,13 +181,9 @@ virAdmGetDefaultURI(virConfPtr conf)
|
|
|
6ae9ed |
/* Since we can't probe connecting via any hypervisor driver as libvirt
|
|
|
6ae9ed |
* does, if no explicit URI was given and neither the environment
|
|
|
6ae9ed |
* variable, nor the configuration parameter had previously been set,
|
|
|
6ae9ed |
- * we set the default admin server URI to 'libvirtd:///system' or
|
|
|
6ae9ed |
- * 'libvirtd:///session' depending on the process's EUID.
|
|
|
6ae9ed |
+ * we set the default admin server URI to 'libvirtd://system'.
|
|
|
6ae9ed |
*/
|
|
|
6ae9ed |
- if (geteuid() == 0)
|
|
|
6ae9ed |
- uristr = "libvirtd:///system";
|
|
|
6ae9ed |
- else
|
|
|
6ae9ed |
- uristr = "libvirtd:///session";
|
|
|
6ae9ed |
+ uristr = "libvirtd:///system";
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
|
|
|
6ae9ed |
return uristr;
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.2
|
|
|
6ae9ed |
|