mirror of
https://src.fedoraproject.org/rpms/virt-manager.git
synced 2025-07-17 01:24:54 +00:00
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
changeset: 830:2893744f29b0
|
|
user: "Daniel P. Berrange <berrange@redhat.com>"
|
|
date: Thu Aug 21 12:29:33 2008 +0100
|
|
files: src/virtManager/connection.py
|
|
description:
|
|
Fix check for policykit
|
|
|
|
|
|
diff -r 043e6981cb84 -r 2893744f29b0 src/virtManager/connection.py
|
|
--- a/src/virtManager/connection.py Thu Aug 21 12:06:35 2008 +0100
|
|
+++ b/src/virtManager/connection.py Thu Aug 21 12:29:33 2008 +0100
|
|
@@ -38,7 +38,10 @@
|
|
from virtManager.netdev import vmmNetDevice
|
|
from virtManager.storagepool import vmmStoragePool
|
|
|
|
-LIBVIRT_POLICY_FILE = "/usr/share/PolicyKit/policy/libvirtd.policy"
|
|
+LIBVIRT_POLICY_FILES = [
|
|
+ "/usr/share/PolicyKit/policy/libvirtd.policy",
|
|
+ "/usr/share/PolicyKit/policy/org.libvirt.unix.policy"
|
|
+]
|
|
|
|
def get_local_hostname():
|
|
try:
|
|
@@ -137,7 +140,12 @@
|
|
|
|
self.readOnly = readOnly
|
|
if not self.is_remote() and os.getuid() != 0 and self.uri != "qemu:///session":
|
|
- if not os.path.exists(LIBVIRT_POLICY_FILE):
|
|
+ hasPolkit = False
|
|
+ for f in LIBVIRT_POLICY_FILES:
|
|
+ if os.path.exists(f):
|
|
+ hasPolkit = True
|
|
+
|
|
+ if not hasPolkit:
|
|
self.readOnly = True
|
|
|
|
self.state = self.STATE_DISCONNECTED
|
|
@@ -460,6 +468,7 @@
|
|
try:
|
|
flags = 0
|
|
if self.readOnly:
|
|
+ logging.info("Caller requested read only connection")
|
|
flags = libvirt.VIR_CONNECT_RO
|
|
|
|
self.vmm = libvirt.openAuth(self.uri,
|
|
|