From: Daniel P. Berrangé <berrange@redhat.com>
Date: Wed, 3 Jul 2019 13:12:10 +0000 (+0100)
Subject: remote: remove obsolete params from sysconf file
X-Git-Tag: v5.6.0-rc1~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc282e90756c3e0160a54d6f1df6c5c66b4a1940;p=thirdparty%2Flibvirt.git

remote: remove obsolete params from sysconf file

The LIBVIRTD_CONFIG and LIBVIRTD_NOFILES_LIMIT parameters were only
honoured when using the sysvinit scripts. This was removed already in

    commit 912fe2df9d8628b2f3d54485f1cb919cb124d07a
    Author: Andrea Bolognani <abologna@redhat.com>
    Date:   Fri Mar 15 16:47:27 2019 +0100

      Drop support for "Red Hat" init scripts

so the parameters can safely be dropped.

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/remote/libvirtd.sysconf b/src/remote/libvirtd.sysconf
index f15e5956eb..60a47c252f 100644
--- a/src/remote/libvirtd.sysconf
+++ b/src/remote/libvirtd.sysconf
@@ -1,8 +1,4 @@
-# Override the default config file
-# NOTE: This setting is no longer honoured if using
-# systemd. Set '--config /etc/libvirt/libvirtd.conf'
-# in LIBVIRTD_ARGS instead.
-#LIBVIRTD_CONFIG=/etc/libvirt/libvirtd.conf
+# Customizations for the libvirtd.service systemd unit
 
 # Listen for TCP/IP connections
 # NB. must setup TLS/SSL keys prior to using this
@@ -19,15 +15,3 @@
 #QEMU_AUDIO_DRV=sdl
 #
 #SDL_AUDIODRIVER=pulse
-
-# Override the maximum number of opened files.
-# This only works with traditional init scripts.
-# In the systemd world, the limit can only be changed by overriding
-# LimitNOFILE for libvirtd.service. To do that, just create a *.conf
-# file in /etc/systemd/system/libvirtd.service.d/ (for example
-# /etc/systemd/system/libvirtd.service.d/openfiles.conf) and write
-# the following two lines in it:
-#   [Service]
-#   LimitNOFILE=2048
-#
-#LIBVIRTD_NOFILES_LIMIT=2048