[gnome-boxes/wip/feborges/flatpak-net-bridge: 3/3] flatpak, util-app: Find the bridge.conf in the right prefix
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/wip/feborges/flatpak-net-bridge: 3/3] flatpak, util-app: Find the bridge.conf in the right prefix
- Date: Mon, 1 Oct 2018 14:03:59 +0000 (UTC)
commit 68042db8470602f8653f88c80b85d15de2968473
Author: Felipe Borges <felipeborges gnome org>
Date: Mon Oct 1 16:01:22 2018 +0200
flatpak, util-app: Find the bridge.conf in the right prefix
For Flatpak, the bridge.conf file will be under /app/etc/qemu
Ref #232
src/util-app.vala | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/src/util-app.vala b/src/util-app.vala
index aba87cfd..2de02ed2 100644
--- a/src/util-app.vala
+++ b/src/util-app.vala
@@ -165,12 +165,22 @@ public bool is_libvirt_bridge_net_available () {
}
// Now check if unprivileged qemu is allowed to access it
- var file = File.new_for_path ("/etc/qemu/bridge.conf");
+#if FLATPAK
+ var qemu_bridge = "/app/etc/qemu/bridge.conf";
+#else
+ var qemu_bridge = "/etc/qemu/bridge.conf";
+#endif
+ var file = File.new_for_path (qemu_bridge);
uint8[] contents;
try {
file.load_contents (null, out contents, null);
} catch (IOError.NOT_FOUND error) {
- file = File.new_for_path ("/etc/qemu-kvm/bridge.conf");
+#if FLATPAK
+ var qemu_kvm_bridge = "/app/etc/qemu-kvm/bridge.conf";
+#else
+ var qemu_kvm_bridge = "/etc/qemu-kvm/bridge.conf"
+#endif
+ file = File.new_for_path (qemu_kvm_bridge);
file.load_contents (null, out contents, null);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]