[gnome-boxes/wip/feborges/flatpak-net-bridge: 362/362] flatpak, util-app: Find the bridge.conf in the right prefix



commit 755eaa3fd218d2188b199d003b7586f261a97e1e
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 3dc35cf7..652d1c3d 100644
--- a/src/util-app.vala
+++ b/src/util-app.vala
@@ -245,12 +245,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]