[libvirt PATCH 11/42] systemd: Drop unnecessary uses of @sockprefix@

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

 



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

Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
 src/ch/meson.build          | 1 -
 src/interface/meson.build   | 1 -
 src/libxl/meson.build       | 1 -
 src/locking/meson.build     | 1 -
 src/logging/meson.build     | 1 -
 src/lxc/meson.build         | 1 -
 src/network/meson.build     | 1 -
 src/node_device/meson.build | 1 -
 src/nwfilter/meson.build    | 1 -
 src/qemu/meson.build        | 1 -
 src/secret/meson.build      | 1 -
 src/storage/meson.build     | 1 -
 src/vbox/meson.build        | 1 -
 src/vz/meson.build          | 1 -
 14 files changed, 14 deletions(-)

diff --git a/src/ch/meson.build b/src/ch/meson.build
index 5d1c3f6ca0..936b9bc95a 100644
--- 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 3df9bbc9a4..06c5241fa3 100644
--- 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 967b6b587c..db8ccde38e 100644
--- 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 b7ba342171..2ccc822ed3 100644
--- 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 aa8affb52c..95d2ef2a3f 100644
--- 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 49cc5e6b26..a8773f64a5 100644
--- 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 121172cafe..40abfaef7e 100644
--- 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 2610822d28..47d9f63600 100644
--- 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 bb03a47f8f..5efdee7189 100644
--- 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 2d55cd30cb..afa9139d9a 100644
--- 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 882ed2ac70..49f6972f36 100644
--- 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 49fd4072d5..d0d0b72228 100644
--- 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 f19d375c4b..9f2fb0f938 100644
--- 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 db3d8bb203..4c8747e3eb 100644
--- 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 += {
-- 
2.41.0




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux