systemd: Drop unnecessary uses of @sockets@

For most services, the value provided explicitly matches the
documented default.

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 66b77907b0dfcf921a5898e29495afa7ad5d81ca..5d1c3f6ca0e54255d98baf3505833e32e9c5b2ed 100644 (file)
--- a/src/ch/meson.build
+++ b/src/ch/meson.build
@@ -60,7 +60,6 @@ if conf.has('WITH_CH')
     'service_in': files('virtchd.service.in'),
     'name': 'Libvirt ch',
     'sockprefix': 'virtchd',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   virt_install_dirs += [

diff --git a/src/interface/meson.build b/src/interface/meson.build
index 828f2744223fbb560ab75003360e46fd8c987fe4..3df9bbc9a406f2a482bcb6d38457deee3cd3d8da 100644 (file)
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -47,7 +47,6 @@ if conf.has('WITH_INTERFACE')
     'service_in': files('virtinterfaced.service.in'),
     'name': 'Libvirt interface',
     'sockprefix': 'virtinterfaced',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   openrc_init_files += {

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

diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 99d4a3421364e3958c5689231ce187de65865064..49cc5e6b269a0a531a84e87f7674cefc92b3e24c 100644 (file)
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -167,7 +167,6 @@ if conf.has('WITH_LXC')
     'service_in': files('virtlxcd.service.in'),
     'name': 'Libvirt lxc',
     'sockprefix': 'virtlxcd',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   openrc_init_files += {

diff --git a/src/network/meson.build b/src/network/meson.build
index 0888d1beaca0ef3b4498ddcd9691bbed6cd2e180..121172cafe98a44eef64f750e4a829d44db206fb 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -65,7 +65,6 @@ if conf.has('WITH_NETWORK')
     'service_in': files('virtnetworkd.service.in'),
     'name': 'Libvirt network',
     'sockprefix': 'virtnetworkd',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   openrc_init_files += {

diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index 1c95975c37602a120529edf7e1254f1644de47d1..2610822d282dd087a2b2305d71892c2dff832284 100644 (file)
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -55,7 +55,6 @@ if conf.has('WITH_NODE_DEVICES')
     'service_in': files('virtnodedevd.service.in'),
     'name': 'Libvirt nodedev',
     'sockprefix': 'virtnodedevd',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   openrc_init_files += {

diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index 55cf8fcce40e54f405bb2d25085372312aeb120d..bb03a47f8fd0cc4b73715893850be63bf12a100a 100644 (file)
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -53,7 +53,6 @@ if conf.has('WITH_NWFILTER')
     'service_in': files('virtnwfilterd.service.in'),
     'name': 'Libvirt nwfilter',
     'sockprefix': 'virtnwfilterd',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   openrc_init_files += {

diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 607b597c8cccd606e6d1ce90235aa88ff0780c33..2d55cd30cbad1f58f67104533c68e05f31f5005c 100644 (file)
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -186,7 +186,6 @@ if conf.has('WITH_QEMU')
     'service_in': files('virtqemud.service.in'),
     'name': 'Libvirt qemu',
     'sockprefix': 'virtqemud',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   openrc_init_files += {

diff --git a/src/secret/meson.build b/src/secret/meson.build
index 1bda59849b4986499e12998a8df32f2526cda53f..882ed2ac706e61319e6d00f71e87f1153765d1d8 100644 (file)
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -36,7 +36,6 @@ if conf.has('WITH_SECRETS')
     'service_in': files('virtsecretd.service.in'),
     'name': 'Libvirt secret',
     'sockprefix': 'virtsecretd',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   openrc_init_files += {

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

diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index 1b0dad3336dbe3c8e4e94467172cba0d38f8ffa2..f19d375c4b8ee0f65971fed08271dea1fce6c7a7 100644 (file)
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -60,7 +60,6 @@ if conf.has('WITH_VBOX')
     'service_in': files('virtvboxd.service.in'),
     'name': 'Libvirt vbox',
     'sockprefix': 'virtvboxd',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   openrc_init_files += {

diff --git a/src/vz/meson.build b/src/vz/meson.build
index d102696943b444be4fa1c2e3c24dc609c4ef29d4..db3d8bb203ba6da548630e0a200de84b6c641b3a 100644 (file)
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -51,7 +51,6 @@ if conf.has('WITH_VZ')
     'service_in': files('virtvzd.service.in'),
     'name': 'Libvirt vz',
     'sockprefix': 'virtvzd',
-    'sockets': [ 'main', 'ro', 'admin' ],
   }
 
   openrc_init_files += {