|
 |
44173a |
From f38b129e38b73cb20a2d858de7b593d09380e548 Mon Sep 17 00:00:00 2001
|
|
|
44173a |
Message-Id: <f38b129e38b73cb20a2d858de7b593d09380e548@dist-git>
|
|
|
44173a |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
44173a |
Date: Wed, 23 Feb 2022 10:45:28 +0100
|
|
|
44173a |
Subject: [PATCH] util: Fix machined servicename
|
|
|
44173a |
|
|
|
44173a |
Commit 4e42686adef8 wrongly assumed how g_variant_new_parsed() works and broke
|
|
|
44173a |
starting of domains on systems with systemd (machined).
|
|
|
44173a |
|
|
|
44173a |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
44173a |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
44173a |
(cherry picked from commit a64e666a112d4d6299d1b73704d176283bc42b19)
|
|
|
44173a |
|
|
|
44173a |
https://bugzilla.redhat.com/show_bug.cgi?id=1868537
|
|
|
44173a |
|
|
|
44173a |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
44173a |
---
|
|
|
44173a |
src/util/virsystemd.c | 12 ++++++------
|
|
|
44173a |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
44173a |
|
|
|
44173a |
diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
|
|
|
44173a |
index f156c2f39a..a8af80c495 100644
|
|
|
44173a |
--- a/src/util/virsystemd.c
|
|
|
44173a |
+++ b/src/util/virsystemd.c
|
|
|
44173a |
@@ -360,6 +360,7 @@ int virSystemdCreateMachine(const char *name,
|
|
|
44173a |
g_autofree char *creatorname = NULL;
|
|
|
44173a |
g_autofree char *slicename = NULL;
|
|
|
44173a |
g_autofree char *scopename = NULL;
|
|
|
44173a |
+ g_autofree char *servicename = NULL;
|
|
|
44173a |
static int hasCreateWithNetwork = 1;
|
|
|
44173a |
|
|
|
44173a |
if ((rc = virSystemdHasMachined()) < 0)
|
|
|
44173a |
@@ -369,6 +370,7 @@ int virSystemdCreateMachine(const char *name,
|
|
|
44173a |
return -1;
|
|
|
44173a |
|
|
|
44173a |
creatorname = g_strdup_printf("libvirt-%s", drivername);
|
|
|
44173a |
+ servicename = g_strdup_printf("virt%sd.service", drivername);
|
|
|
44173a |
|
|
|
44173a |
if (partition) {
|
|
|
44173a |
if (!(slicename = virSystemdMakeSliceName(partition)))
|
|
|
44173a |
@@ -440,11 +442,10 @@ int virSystemdCreateMachine(const char *name,
|
|
|
44173a |
gnicindexes = g_variant_new_fixed_array(G_VARIANT_TYPE("i"),
|
|
|
44173a |
nicindexes, nnicindexes, sizeof(int));
|
|
|
44173a |
gprops = g_variant_new_parsed("[('Slice', <%s>),"
|
|
|
44173a |
- " ('After', <['libvirtd.service']>),"
|
|
|
44173a |
- " ('After', <['virt%sd.service']>),"
|
|
|
44173a |
+ " ('After', <['libvirtd.service', %s]>),"
|
|
|
44173a |
" ('Before', <['virt-guest-shutdown.target']>)]",
|
|
|
44173a |
slicename,
|
|
|
44173a |
- drivername);
|
|
|
44173a |
+ servicename);
|
|
|
44173a |
message = g_variant_new("(s@ayssus@ai@a(sv))",
|
|
|
44173a |
name,
|
|
|
44173a |
guuid,
|
|
|
44173a |
@@ -490,11 +491,10 @@ int virSystemdCreateMachine(const char *name,
|
|
|
44173a |
guuid = g_variant_new_fixed_array(G_VARIANT_TYPE("y"),
|
|
|
44173a |
uuid, 16, sizeof(unsigned char));
|
|
|
44173a |
gprops = g_variant_new_parsed("[('Slice', <%s>),"
|
|
|
44173a |
- " ('After', <['libvirtd.service']>),"
|
|
|
44173a |
- " ('After', <['virt%sd.service']>),"
|
|
|
44173a |
+ " ('After', <['libvirtd.service', %s]>),"
|
|
|
44173a |
" ('Before', <['virt-guest-shutdown.target']>)]",
|
|
|
44173a |
slicename,
|
|
|
44173a |
- drivername);
|
|
|
44173a |
+ servicename);
|
|
|
44173a |
message = g_variant_new("(s@ayssus@a(sv))",
|
|
|
44173a |
name,
|
|
|
44173a |
guuid,
|
|
|
44173a |
--
|
|
|
44173a |
2.35.1
|
|
|
44173a |
|