systemd: Rename @mode@ -> @sockmode@

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

diff --git a/src/meson.build b/src/meson.build
index 7b6ce6d32f5356d46a6034b09b3a85b37b41b181..3fae80d67c294fbcb5015b31286f5fab994376c7 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -799,9 +799,9 @@ if conf.has('WITH_LIBVIRTD')
 
     foreach unit : virt_daemon_units
       if conf.has('WITH_POLKIT')
-        mode = '0666'
+        sockmode = '0666'
       else
-        mode = '0600'
+        sockmode = '0600'
       endif
 
       unit_conf = configuration_data({
@@ -813,7 +813,7 @@ if conf.has('WITH_LIBVIRTD')
         'service': unit['service'],
         'sockprefix': unit['sockprefix'],
         'deps': unit.get('deps', ''),
-        'mode': mode,
+        'sockmode': sockmode,
       })
 
       configure_file(

diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in
index 48427126483da9d975518970396611baaac5ac26..e6e903a8cecb2f37837e2b1af065b55549d4e32a 100644 (file)
--- a/src/remote/libvirtd.socket.in
+++ b/src/remote/libvirtd.socket.in
@@ -6,7 +6,7 @@ Before=@service@.service
 [Socket]
 ListenStream=@runstatedir@/libvirt/@sockprefix@-sock
 Service=@service@.service
-SocketMode=@mode@
+SocketMode=@sockmode@
 RemoveOnStop=yes
 
 [Install]