External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Fix machined servicename

Browse Source 
Commit 4e42686ade wrongly assumed how g_variant_new_parsed() works and broke
starting of domains on systems with systemd (machined).

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Martin Kletzander 2022-02-23 10:45:28 +01:00
parent 24adb6c7a6
commit a64e666a11
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/virsystemd.c
View File

@ -360,6 +360,7 @@ int virSystemdCreateMachine(const char *name,
g_autofree char *creatorname = NULL; g_autofree char *creatorname = NULL;
g_autofree char *slicename = NULL; g_autofree char *slicename = NULL;
g_autofree char *scopename = NULL; g_autofree char *scopename = NULL;
g_autofree char *servicename = NULL;
static int hasCreateWithNetwork = 1; static int hasCreateWithNetwork = 1;
if ((rc = virSystemdHasMachined()) < 0) if ((rc = virSystemdHasMachined()) < 0)
@ -369,6 +370,7 @@ int virSystemdCreateMachine(const char *name,
return -1; return -1;
creatorname = g_strdup_printf("libvirt-%s", drivername); creatorname = g_strdup_printf("libvirt-%s", drivername);
servicename = g_strdup_printf("virt%sd.service", drivername);
if (partition) { if (partition) {
if (!(slicename = virSystemdMakeSliceName(partition))) if (!(slicename = virSystemdMakeSliceName(partition)))
@ -440,11 +442,10 @@ int virSystemdCreateMachine(const char *name,
gnicindexes = g_variant_new_fixed_array(G_VARIANT_TYPE("i"), gnicindexes = g_variant_new_fixed_array(G_VARIANT_TYPE("i"),
nicindexes, nnicindexes, sizeof(int)); nicindexes, nnicindexes, sizeof(int));
gprops = g_variant_new_parsed("[('Slice', <%s>)," gprops = g_variant_new_parsed("[('Slice', <%s>),"
" ('After', <['libvirtd.service']>)," " ('After', <['libvirtd.service', %s]>),"
" ('After', <['virt%sd.service']>),"
" ('Before', <['virt-guest-shutdown.target']>)]", " ('Before', <['virt-guest-shutdown.target']>)]",
slicename, slicename,
drivername); servicename);
message = g_variant_new("(s@ayssus@ai@a(sv))", message = g_variant_new("(s@ayssus@ai@a(sv))",
name, name,
guuid, guuid,
@ -490,11 +491,10 @@ int virSystemdCreateMachine(const char *name,
guuid = g_variant_new_fixed_array(G_VARIANT_TYPE("y"), guuid = g_variant_new_fixed_array(G_VARIANT_TYPE("y"),
uuid, 16, sizeof(unsigned char)); uuid, 16, sizeof(unsigned char));
gprops = g_variant_new_parsed("[('Slice', <%s>)," gprops = g_variant_new_parsed("[('Slice', <%s>),"
" ('After', <['libvirtd.service']>)," " ('After', <['libvirtd.service', %s]>),"
" ('After', <['virt%sd.service']>),"
" ('Before', <['virt-guest-shutdown.target']>)]", " ('Before', <['virt-guest-shutdown.target']>)]",
slicename, slicename,
drivername); servicename);
message = g_variant_new("(s@ayssus@a(sv))", message = g_variant_new("(s@ayssus@a(sv))",
name, name,
guuid, guuid,