systemd: Drop unnecessary uses of @sockprefix@

Now that providing the value is optional, we can remove almost
all uses.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/ch/meson.build b/src/ch/meson.build
index 5d1c3f6ca0e54255d98baf3505833e32e9c5b2ed..936b9bc95a8ea33c1dfe6cca9eeeac62c0cbc7f8 100644 (file)
--- a/src/ch/meson.build
+++ b/src/ch/meson.build
@@ -59,7 +59,6 @@ if conf.has('WITH_CH')
     'service': 'virtchd',
     'service_in': files('virtchd.service.in'),
     'name': 'Libvirt ch',
-    'sockprefix': 'virtchd',
   }
 
   virt_install_dirs += [

diff --git a/src/interface/meson.build b/src/interface/meson.build
index 3df9bbc9a406f2a482bcb6d38457deee3cd3d8da..06c5241fa380aa24e99a24244e7bcceb9876bbf6 100644 (file)
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -46,7 +46,6 @@ if conf.has('WITH_INTERFACE')
     'service': 'virtinterfaced',
     'service_in': files('virtinterfaced.service.in'),
     'name': 'Libvirt interface',
-    'sockprefix': 'virtinterfaced',
   }
 
   openrc_init_files += {

diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 967b6b587c4eb9fba284757ddf9450fccffb5372..db8ccde38eadc7a84eef37c7696764d21cbdd8f8 100644 (file)
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -68,7 +68,6 @@ if conf.has('WITH_LIBXL')
     'service': 'virtxend',
     'service_in': files('virtxend.service.in'),
     'name': 'Libvirt libxl',
-    'sockprefix': 'virtxend',
     'deps': 'ConditionPathExists=/proc/xen/capabilities',
   }
 

diff --git a/src/locking/meson.build b/src/locking/meson.build
index b7ba342171943651b01f341ddd0c639c74514826..2ccc822ed3cc02112db6989a57bc7df7a1a6839a 100644 (file)
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -145,7 +145,6 @@ if conf.has('WITH_LIBVIRTD')
     'service': 'virtlockd',
     'service_in': files('virtlockd.service.in'),
     'name': 'Libvirt locking',
-    'sockprefix': '',
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlockd.socket.in'),
     'socket_admin_in': files('virtlockd-admin.socket.in'),

diff --git a/src/logging/meson.build b/src/logging/meson.build
index aa8affb52ca18c9c10c09b88a3545c118630e09f..95d2ef2a3f206b02a212a33b758c31097085df71 100644 (file)
--- a/src/logging/meson.build
+++ b/src/logging/meson.build
@@ -92,7 +92,6 @@ if conf.has('WITH_LIBVIRTD')
     'service': 'virtlogd',
     'service_in': files('virtlogd.service.in'),
     'name': 'Libvirt logging',
-    'sockprefix': '',
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlogd.socket.in'),
     'socket_admin_in': files('virtlogd-admin.socket.in'),

diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 49cc5e6b269a0a531a84e87f7674cefc92b3e24c..a8773f64a58abfc3e14d5859d8db083f69a737a2 100644 (file)
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -166,7 +166,6 @@ if conf.has('WITH_LXC')
     'service': 'virtlxcd',
     'service_in': files('virtlxcd.service.in'),
     'name': 'Libvirt lxc',
-    'sockprefix': 'virtlxcd',
   }
 
   openrc_init_files += {

diff --git a/src/network/meson.build b/src/network/meson.build
index 121172cafe98a44eef64f750e4a829d44db206fb..40abfaef7ead1446f9a3fc77299f1bfdea3561b2 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -64,7 +64,6 @@ if conf.has('WITH_NETWORK')
     'service': 'virtnetworkd',
     'service_in': files('virtnetworkd.service.in'),
     'name': 'Libvirt network',
-    'sockprefix': 'virtnetworkd',
   }
 
   openrc_init_files += {

diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index 2610822d282dd087a2b2305d71892c2dff832284..47d9f63600e43db6f5b8b6a0c74468cb3b70ab1e 100644 (file)
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -54,7 +54,6 @@ if conf.has('WITH_NODE_DEVICES')
     'service': 'virtnodedevd',
     'service_in': files('virtnodedevd.service.in'),
     'name': 'Libvirt nodedev',
-    'sockprefix': 'virtnodedevd',
   }
 
   openrc_init_files += {

diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index bb03a47f8fd0cc4b73715893850be63bf12a100a..5efdee71897d0625e6caa84f2fdd28b7cac2aa58 100644 (file)
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -52,7 +52,6 @@ if conf.has('WITH_NWFILTER')
     'service': 'virtnwfilterd',
     'service_in': files('virtnwfilterd.service.in'),
     'name': 'Libvirt nwfilter',
-    'sockprefix': 'virtnwfilterd',
   }
 
   openrc_init_files += {

diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 2d55cd30cbad1f58f67104533c68e05f31f5005c..afa9139d9a593257c69eb62983a53063ba497824 100644 (file)
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -185,7 +185,6 @@ if conf.has('WITH_QEMU')
     'service': 'virtqemud',
     'service_in': files('virtqemud.service.in'),
     'name': 'Libvirt qemu',
-    'sockprefix': 'virtqemud',
   }
 
   openrc_init_files += {

diff --git a/src/secret/meson.build b/src/secret/meson.build
index 882ed2ac706e61319e6d00f71e87f1153765d1d8..49f6972f368f495c047c81a29ce7bcfbabf8ca3c 100644 (file)
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -35,7 +35,6 @@ if conf.has('WITH_SECRETS')
     'service': 'virtsecretd',
     'service_in': files('virtsecretd.service.in'),
     'name': 'Libvirt secret',
-    'sockprefix': 'virtsecretd',
   }
 
   openrc_init_files += {

diff --git a/src/storage/meson.build b/src/storage/meson.build
index 49fd4072d5d218702a48e96b260e9223fdb252ac..d0d0b722284f49fb3d116f882d492b523f83834b 100644 (file)
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -113,7 +113,6 @@ if conf.has('WITH_STORAGE')
     'service': 'virtstoraged',
     'service_in': files('virtstoraged.service.in'),
     'name': 'Libvirt storage',
-    'sockprefix': 'virtstoraged',
   }
 
   openrc_init_files += {

diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index f19d375c4b8ee0f65971fed08271dea1fce6c7a7..9f2fb0f938fbf70b76194b962d9bffe003c846f7 100644 (file)
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -59,7 +59,6 @@ if conf.has('WITH_VBOX')
     'service': 'virtvboxd',
     'service_in': files('virtvboxd.service.in'),
     'name': 'Libvirt vbox',
-    'sockprefix': 'virtvboxd',
   }
 
   openrc_init_files += {

diff --git a/src/vz/meson.build b/src/vz/meson.build
index db3d8bb203ba6da548630e0a200de84b6c641b3a..4c8747e3eb11358a69cde160e32a1b7c5806934a 100644 (file)
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -50,7 +50,6 @@ if conf.has('WITH_VZ')
     'service': 'virtvzd',
     'service_in': files('virtvzd.service.in'),
     'name': 'Libvirt vz',
-    'sockprefix': 'virtvzd',
   }
 
   openrc_init_files += {