From e9d4dc95128876754efdbea5ddcfc24ce802cadf Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Mon, 25 Sep 2023 16:54:37 +0200 Subject: [PATCH] systemd: Rename @mode@ -> @sockmode@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrangé --- src/meson.build | 6 +++--- src/remote/libvirtd.socket.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index 7b6ce6d32f..3fae80d67c 100644 --- 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 4842712648..e6e903a8ce 100644 --- 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]