[gnome-boxes/wip/spawn-monitor-sock-elsewhere] build: Spawn monitor.sock in XDG_RUNTIME_DIR



commit 2eb9d87108503522a874da6618231c5465644193
Author: Felipe Borges <felipeborges gnome org>
Date:   Wed Jul 29 12:57:40 2020 +0200

    build: Spawn monitor.sock in XDG_RUNTIME_DIR
    
    See also https://github.com/flatpak/flatpak/issues/3336
    
    Fixes #267

 .../libvirt-use-monitor-in-xdg-runtime-dir.patch   | 25 ++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Boxes.json             |  4 ++++
 2 files changed, 29 insertions(+)
---
diff --git a/build-aux/flatpak/libvirt-use-monitor-in-xdg-runtime-dir.patch 
b/build-aux/flatpak/libvirt-use-monitor-in-xdg-runtime-dir.patch
new file mode 100644
index 00000000..76937557
--- /dev/null
+++ b/build-aux/flatpak/libvirt-use-monitor-in-xdg-runtime-dir.patch
@@ -0,0 +1,25 @@
+From 7c130dfe8ef697b3660e0fc6feb8aa74bedbcfb5 Mon Sep 17 00:00:00 2001
+From: Felipe Borges <felipeborges gnome org>
+Date: Wed, 29 Jul 2020 12:03:34 +0200
+Subject: [PATCH] use monitor in XDG_RUNTIME_DIR
+
+---
+ src/qemu/qemu_process.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index d36088ba98..f1ce062fa9 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -3184,7 +3184,7 @@ qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig,
+     monConfig->type = VIR_DOMAIN_CHR_TYPE_UNIX;
+     monConfig->data.nix.listen = true;
+ 
+-    monConfig->data.nix.path = g_strdup_printf("%s/monitor.sock", domainDir);
++    monConfig->data.nix.path = g_strdup_printf("%s/monitor.sock", g_get_user_runtime_dir ());
+     return 0;
+ }
+ 
+-- 
+2.26.2
+
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index 24013de3..0fce39b3 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -176,6 +176,10 @@
                 {
                     "type" : "patch",
                     "path" : "libvirt-check-for-disk-type-correctly.patch"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "libvirt-use-monitor-in-xdg-runtime-dir.patch"
                 }
             ]
         },


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]