From: Michal Privoznik Date: Sun, 5 Apr 2020 12:47:55 +0000 (+0200) Subject: app-emulation/libvirt: Drop unused files X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f878989202041fd75730a8302caea50e495e4ae3;p=gentoo.git app-emulation/libvirt: Drop unused files There are some files under files/ directory that are not used anymore. For instance, patches for older (now removed) ebuilds and some old init scripts. Signed-off-by: Michal Privoznik Signed-off-by: Matthias Maier --- diff --git a/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch deleted file mode 100644 index 292af16b4915..000000000000 --- a/app-emulation/libvirt/files/libvirt-5.2.0-do-not-use-sysconf.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 525d89d39f78a4099508f47a58c4ab65d1e59c0a Mon Sep 17 00:00:00 2001 -Message-Id: <525d89d39f78a4099508f47a58c4ab65d1e59c0a.1552736006.git.mprivozn@redhat.com> -From: Michal Privoznik -Date: Sat, 16 Mar 2019 12:33:00 +0100 -Subject: [PATCH] gentoo: do not use sysconf - -Signed-off-by: Michal Privoznik ---- - src/Makefile.am | 21 ++------------------- - src/locking/virtlockd.service.in | 3 +-- - src/logging/virtlogd.service.in | 3 +-- - src/remote/libvirtd.service.in | 3 +-- - tools/Makefile.am | 13 ++----------- - tools/libvirt-guests.service.in | 2 +- - tools/libvirt-guests.sysconf | 7 +++++++ - 7 files changed, 15 insertions(+), 37 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index a73f43c483..47dd55c112 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -747,23 +747,6 @@ endif WITH_SETUID_RPC_CLIENT - - EXTRA_DIST += $(SYSCONF_FILES) - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- --uninstall-sysconfig: -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : -- - LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) - - EXTRA_DIST += $(LOGROTATE_FILES_IN) -@@ -822,14 +805,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) - BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) - DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) - --install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig -+install-systemd: $(SYSTEMD_UNIT_FILES) - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - for f in $(SYSTEMD_UNIT_FILES); \ - do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ - done - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : - -diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index 3c9d587032..2449b201d9 100644 ---- a/src/locking/virtlockd.service.in -+++ b/src/locking/virtlockd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-/etc/sysconfig/virtlockd --ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS -+ExecStart=@sbindir@/virtlockd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the locks is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in -index 3d9ae36150..43736191d5 100644 ---- a/src/logging/virtlogd.service.in -+++ b/src/logging/virtlogd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-/etc/sysconfig/virtlogd --ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS -+ExecStart=@sbindir@/virtlogd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the logs is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 7f689e08a8..239beeced9 100644 ---- a/src/remote/libvirtd.service.in -+++ b/src/remote/libvirtd.service.in -@@ -22,8 +22,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify --EnvironmentFile=-/etc/sysconfig/libvirtd --ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS -+ExecStart=@sbindir@/libvirtd - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process - Restart=on-failure -diff --git a/tools/Makefile.am b/tools/Makefile.am -index c6064dee08..40f41ddb38 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -333,15 +333,6 @@ install-data-local: install-systemd install-nss \ - uninstall-local: uninstall-systemd uninstall-nss \ - uninstall-bash-completion - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- --uninstall-sysconfig: -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: -- - EXTRA_DIST += libvirt-guests.sh.in - - libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status -@@ -361,12 +352,12 @@ EXTRA_DIST += libvirt-guests.service.in - SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system - - if LIBVIRT_INIT_SCRIPT_SYSTEMD --install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh -+install-systemd: libvirt-guests.service libvirt-guests.sh - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) libvirt-guests.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: - -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 491ca62138..f0f417bffb 100644 ---- a/tools/libvirt-guests.service.in -+++ b/tools/libvirt-guests.service.in -@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-/etc/sysconfig/libvirt-guests -+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf - # Hack just call traditional service until we factor - # out the code - ExecStart=@libexecdir@/libvirt-guests.sh start -diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -index 669b046507..45b0b9ea46 100644 ---- a/tools/libvirt-guests.sysconf -+++ b/tools/libvirt-guests.sysconf -@@ -1,3 +1,10 @@ -+# -+# Warning: This configuration file is only sourced by the systemd -+# libvirt-guests.service unit. The coresponding openrc facility is in -+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd -+# -+ -+ - # URIs to check for running guests - # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' - #URIS=default --- -2.19.2 - diff --git a/app-emulation/libvirt/files/libvirt-5.2.0-md-clear.patch b/app-emulation/libvirt/files/libvirt-5.2.0-md-clear.patch deleted file mode 100644 index cd14d0d539ae..000000000000 --- a/app-emulation/libvirt/files/libvirt-5.2.0-md-clear.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 538d873571d7a682852dc1d70e5f4478f4d64e85 Mon Sep 17 00:00:00 2001 -From: Jiri Denemark -Date: Fri, 5 Apr 2019 15:11:20 +0200 -Subject: [PATCH] cpu_map: Define md-clear CPUID bit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091 - -The bit is set when microcode provides the mechanism to invoke a flush -of various exploitable CPU buffers by invoking the VERW instruction. - -Signed-off-by: Paolo Bonzini -Signed-off-by: Jiri Denemark -Reviewed-by: Daniel P. Berrangé ---- - src/cpu_map/x86_features.xml | 3 +++ - -diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml -index efcc10b1ae..370807f88e 100644 ---- a/src/cpu_map/x86_features.xml -+++ b/src/cpu_map/x86_features.xml -@@ -320,6 +320,9 @@ - - - -+ -+ -+ - - - --- -2.21.0 - diff --git a/app-emulation/libvirt/files/libvirt-5.6.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.6.0-do-not-use-sysconf.patch deleted file mode 100644 index b847392cc13d..000000000000 --- a/app-emulation/libvirt/files/libvirt-5.6.0-do-not-use-sysconf.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 8b27863cd4bd4eebefe6f39b42c181d073b457ff Mon Sep 17 00:00:00 2001 -Message-Id: <8b27863cd4bd4eebefe6f39b42c181d073b457ff.1564650738.git.mprivozn@redhat.com> -From: Michal Privoznik -Date: Sat, 16 Mar 2019 12:33:00 +0100 -Subject: [PATCH] gentoo: do not use sysconf - -Signed-off-by: Michal Privoznik ---- - src/Makefile.am | 21 ++------------------- - src/locking/virtlockd.service.in | 3 +-- - src/logging/virtlogd.service.in | 3 +-- - src/remote/libvirtd.service.in | 3 +-- - tools/Makefile.am | 13 ++----------- - tools/libvirt-guests.service.in | 2 +- - tools/libvirt-guests.sysconf | 7 +++++++ - 7 files changed, 15 insertions(+), 37 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 4a8cae11dc..6c93435066 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -750,23 +750,6 @@ endif WITH_SETUID_RPC_CLIENT - - EXTRA_DIST += $(SYSCONF_FILES) - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- --uninstall-sysconfig: -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : -- - LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) - - EXTRA_DIST += $(LOGROTATE_FILES_IN) -@@ -825,14 +808,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) - BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) - DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) - --install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig -+install-systemd: $(SYSTEMD_UNIT_FILES) - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - for f in $(SYSTEMD_UNIT_FILES); \ - do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ - done - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : - -diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index 3c9d587032..2449b201d9 100644 ---- a/src/locking/virtlockd.service.in -+++ b/src/locking/virtlockd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-/etc/sysconfig/virtlockd --ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS -+ExecStart=@sbindir@/virtlockd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the locks is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in -index 3d9ae36150..43736191d5 100644 ---- a/src/logging/virtlogd.service.in -+++ b/src/logging/virtlogd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-/etc/sysconfig/virtlogd --ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS -+ExecStart=@sbindir@/virtlogd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the logs is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 3ddf0e229b..a38f2b08fa 100644 ---- a/src/remote/libvirtd.service.in -+++ b/src/remote/libvirtd.service.in -@@ -20,12 +20,11 @@ Documentation=https://libvirt.org - - [Service] - Type=notify --EnvironmentFile=-/etc/sysconfig/libvirtd - # libvirtd.service is set to run on boot so that autostart of - # VMs can be performed. We don't want it to stick around if - # unused though, so we set a timeout. The socket activation - # then ensures it gets started again if anything needs it --ExecStart=@sbindir@/libvirtd --timeout 120 $LIBVIRTD_ARGS -+ExecStart=@sbindir@/libvirtd --timeout 120 - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process - Restart=on-failure -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 2807b9f6fd..cde5dba193 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -334,15 +334,6 @@ install-data-local: install-systemd install-nss \ - uninstall-local: uninstall-systemd uninstall-nss \ - uninstall-bash-completion - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- --uninstall-sysconfig: -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: -- - EXTRA_DIST += libvirt-guests.sh.in - - libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status -@@ -362,12 +353,12 @@ EXTRA_DIST += libvirt-guests.service.in - SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system - - if LIBVIRT_INIT_SCRIPT_SYSTEMD --install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh -+install-systemd: libvirt-guests.service libvirt-guests.sh - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) libvirt-guests.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: - -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 491ca62138..f0f417bffb 100644 ---- a/tools/libvirt-guests.service.in -+++ b/tools/libvirt-guests.service.in -@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-/etc/sysconfig/libvirt-guests -+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf - # Hack just call traditional service until we factor - # out the code - ExecStart=@libexecdir@/libvirt-guests.sh start -diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -index 669b046507..45b0b9ea46 100644 ---- a/tools/libvirt-guests.sysconf -+++ b/tools/libvirt-guests.sysconf -@@ -1,3 +1,10 @@ -+# -+# Warning: This configuration file is only sourced by the systemd -+# libvirt-guests.service unit. The coresponding openrc facility is in -+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd -+# -+ -+ - # URIs to check for running guests - # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' - #URIS=default --- -2.21.0 - diff --git a/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch deleted file mode 100644 index 2ffffe492db3..000000000000 --- a/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch +++ /dev/null @@ -1,170 +0,0 @@ -From e387be8671d0de88632d063e2ecd2c12eb1b2fdf Mon Sep 17 00:00:00 2001 -Message-Id: -From: Michal Privoznik -Date: Sat, 16 Mar 2019 12:33:00 +0100 -Subject: [PATCH] gentoo: do not use sysconf - -Signed-off-by: Michal Privoznik ---- - src/Makefile.am | 21 ++------------------- - src/locking/virtlockd.service.in | 3 +-- - src/logging/virtlogd.service.in | 3 +-- - src/remote/libvirtd.service.in | 3 +-- - tools/Makefile.am | 13 ++----------- - tools/libvirt-guests.service.in | 2 +- - tools/libvirt-guests.sysconf | 7 +++++++ - 7 files changed, 15 insertions(+), 37 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index f5093b9c90..e2ebc51c87 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -672,23 +672,6 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) - - EXTRA_DIST += $(SYSCONF_FILES) - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- --uninstall-sysconfig: -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : -- - LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) - - EXTRA_DIST += $(LOGROTATE_FILES_IN) -@@ -746,14 +729,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system - BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) - DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) - --install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig -+install-systemd: $(SYSTEMD_UNIT_FILES) - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - for f in $(SYSTEMD_UNIT_FILES); \ - do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ - done - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : - -diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index e7f8057c06..2449b201d9 100644 ---- a/src/locking/virtlockd.service.in -+++ b/src/locking/virtlockd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd --ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS -+ExecStart=@sbindir@/virtlockd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the locks is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in -index daff48e67d..43736191d5 100644 ---- a/src/logging/virtlogd.service.in -+++ b/src/logging/virtlogd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd --ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS -+ExecStart=@sbindir@/virtlogd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the logs is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 9c8c54a2ef..a042280cef 100644 ---- a/src/remote/libvirtd.service.in -+++ b/src/remote/libvirtd.service.in -@@ -25,8 +25,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd --ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS -+ExecStart=@sbindir@/libvirtd - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process - Restart=on-failure -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 29fdbfe846..04b21eb54a 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -360,15 +360,6 @@ install-data-local: install-systemd install-nss \ - uninstall-local: uninstall-systemd uninstall-nss \ - uninstall-bash-completion - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- --uninstall-sysconfig: -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: -- - EXTRA_DIST += libvirt-guests.sh.in - - libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status -@@ -388,12 +379,12 @@ EXTRA_DIST += libvirt-guests.service.in - SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system - - if LIBVIRT_INIT_SCRIPT_SYSTEMD --install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh -+install-systemd: libvirt-guests.service libvirt-guests.sh - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) libvirt-guests.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: - -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 10c664016a..f0f417bffb 100644 ---- a/tools/libvirt-guests.service.in -+++ b/tools/libvirt-guests.service.in -@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests -+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf - # Hack just call traditional service until we factor - # out the code - ExecStart=@libexecdir@/libvirt-guests.sh start -diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -index 669b046507..45b0b9ea46 100644 ---- a/tools/libvirt-guests.sysconf -+++ b/tools/libvirt-guests.sysconf -@@ -1,3 +1,10 @@ -+# -+# Warning: This configuration file is only sourced by the systemd -+# libvirt-guests.service unit. The coresponding openrc facility is in -+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd -+# -+ -+ - # URIs to check for running guests - # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' - #URIS=default --- -2.21.0 - diff --git a/app-emulation/libvirt/files/libvirt-guests.init-r3 b/app-emulation/libvirt/files/libvirt-guests.init-r3 deleted file mode 100644 index 10797e1b8075..000000000000 --- a/app-emulation/libvirt/files/libvirt-guests.init-r3 +++ /dev/null @@ -1,236 +0,0 @@ -#!/sbin/openrc-run - -description="Virtual Machine Management (libvirt) Guests" - -depend() { - use libvirtd -} - -# set the default to QEMU -[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system" - -# default to suspending the VM via managedsave -case "${LIBVIRT_SHUTDOWN}" in - managedsave|shutdown|destroy) ;; - *) LIBVIRT_SHUTDOWN="managedsave" ;; -esac - -# default to 500 seconds -[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500 - -gueststatefile="/var/lib/libvirt/libvirt-guests.state" -netstatefile="/var/lib/libvirt/libvirt-net.state" - -do_virsh() { - local hvuri=$1 - shift - - # if unset, default to qemu - [ -z ${hvuri} ] && hvuri="qemu:///system" - # if only qemu was supplied then correct the value - [ "xqemu" = x${hvuri} ] && hvuri="qemu:///system" - - # Silence errors because virsh always throws an error about - # not finding the hypervisor version when connecting to libvirtd - # lastly strip the blank line at the end - LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1 -} - -libvirtd_dom_list() { - # Only work with domains by their UUIDs - local hvuri=$1 - shift - - # The grep is to remove dom0 for xen domains. Otherwise we never hit 0 - do_virsh "${hvuri}" list --uuid $@ | grep -v 00000000-0000-0000-0000-000000000000 -} - -libvirtd_dom_count() { - local hvuri=$1 - shift - - libvirtd_dom_list "${hvuri}" $@ | wc -l -} - -libvirtd_net_list() { - # Only work with networks by their UUIDs - local hvuri=$1 - shift - - do_virsh "${hvuri}" net-list --uuid $@ -} - -libvirtd_net_count() { - local hvuri=$1 - shift - - libvirtd_net_list "${hvuri}" $@ | wc -l -} - -libvirtd_dom_stop() { - # stops all persistent or transient domains for a given URI - # $1 - uri - # $2 - persisent/transient - - local uri=$1 - local persist=$2 - local shutdown_type=${LIBVIRT_SHUTDOWN} - local counter=${LIBVIRT_MAXWAIT} - local dom_name= - local dom_as= - local dom_ids= - local uuid= - local dom_count= - - [ "${persist}" = "--transient" ] && shutdown_type="shutdown" - [ -n "${counter}" ] || counter=500 - - einfo " Shutting down domain(s) ..." - - # grab all persistent or transient domains running - dom_ids=$(libvirtd_dom_list ${uri} ${persist}) - - for uuid in ${dom_ids}; do - # Get the name - dom_name=$(do_virsh ${uri} domname ${uuid}) - einfo " ${dom_name}" - # Get autostart state - dom_as=$(do_virsh ${uri} dominfo ${uuid} | \ - awk '$1 == "Autostart:" { print $2 }') - - if [ "${persist}" = "--persistent" ]; then - # Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes - if [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \ - [ ${dom_as} = "enabled" ]; then - : - else - echo "${uri} ${uuid}" >> ${gueststatefile} - fi - - fi - - # Now let's stop it - do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null - - done - - dom_count="$(libvirtd_dom_count ${uri} ${persist})" - while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do - dom_count="$(libvirtd_dom_count ${uri} ${persist})" - sleep 1 - if [ "${shutdown_type}" = "shutdown" ]; then - counter=$((${counter} - 1)) - fi - printf "." - done - - if [ "${shutdown_type}" = "shutdown" ]; then - # grab all domains still running - dom_ids=$(libvirtd_dom_list ${uri} ${persist}) - for uuid in ${dom_ids}; do - dom_name=$(do_virsh ${uri} domname ${uuid}) - eerror " ${dom_name} forcibly stopped" - do_virsh "${uri}" destroy ${uuid} > /dev/null - done - fi -} - -libvirtd_net_stop() { - # stops all persistent or transient domains for a given URI - # $1 - uri - # $2 - persisent/transient - - local uri=$1 - local persist=$2 - local uuid= - local net_name= - - if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then - - einfo " Shutting down network(s):" - for uuid in $(libvirtd_net_list ${uri} ${persist}); do - net_name=$(do_virsh ${uri} net-name ${uuid}) - einfo " ${net_name}" - - if [ "${persist}" = "--persistent" ]; then - # Save our running state - echo "${uri} ${uuid}" >> ${netstatefile} - - fi - - # Actually stop the network - do_virsh qemu net-destroy ${uuid} > /dev/null - done - - fi -} - -start() { - local uri= - local uuid= - local name= - - for uri in ${LIBVIRT_URIS}; do - do_virsh "${uri}" connect - if [ $? -ne 0 ]; then - eerror "Failed to connect to '${uri}'. Domains may not start." - fi - done - - [ ! -e "${netstatefile}" ] && touch "${netstatefile}" - [ ! -e "${gueststatefile}" ] && touch "${gueststatefile}" - - # if the user didn't want to start any guests up then respect their wish - [ "x${LIBVIRT_START}" = "xno" ] && return 0 - - # start networks - ebegin "Starting libvirt networks" - while read -r uri uuid - do - # ignore trash - [ -z "${uri}" ] || [ -z "${uuid}" ] && continue - - name=$(do_virsh "${uri}" net-name ${uuid}) - einfo " ${name}" - do_virsh "${uri}" net-start ${uuid} > /dev/null - done <"${netstatefile}" - eend 0 - - # start domains - ebegin "Starting libvirt domains" - while read -r uri uuid - do - # ignore trash - [ -z "${uri}" ] || [ -z "${uuid}" ] && continue - - name=$(do_virsh "${uri}" domname ${uuid}) - einfo " ${name}" - do_virsh "${uri}" start ${uuid} > /dev/null - done <"${gueststatefile}" - eend 0 -} - -stop() { - local counter= - local dom_name= - local net_name= - local dom_ids= - local uuid= - local dom_count= - - rm -f "${gueststatefile}" - [ $? -ne 0 ] && eerror "Unable to save domain state" - rm -f "${netstatefile}" - [ $? -ne 0 ] && eerror "Unable to save net state" - - for uri in ${LIBVIRT_URIS}; do - einfo "Stopping libvirt domains and networks for ${uri}" - - libvirtd_dom_stop "${uri}" "--persistent" - libvirtd_dom_stop "${uri}" "--transient" - libvirtd_net_stop "${uri}" "--persistent" - libvirtd_net_stop "${uri}" "--transient" - - einfo "Done stopping domains and networks for ${uri}" - done -} diff --git a/app-emulation/libvirt/files/libvirtd.init-r17 b/app-emulation/libvirt/files/libvirtd.init-r17 deleted file mode 100644 index 0f89df82db46..000000000000 --- a/app-emulation/libvirt/files/libvirtd.init-r17 +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Virtual Machine Management daemon (libvirt)" - -LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"} -LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"} - -command="/usr/sbin/libvirtd" -command_args="-d ${LIBVIRTD_OPTS}" -start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab" -pidfile="/run/libvirtd.pid" -retry="${LIBVIRTD_TERMTIMEOUT}" - -depend() { - need virtlogd - use dbus virtlockd - after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled - USE_FLAG_FIREWALLD - USE_FLAG_AVAHI - USE_FLAG_ISCSI - USE_FLAG_RBD -} - -start_pre() { - # Test configuration directories in /etc/libvirt/ to be either not - # present or a directory, i.e. not a regular file, bug #532892 - - checkpath --directory /etc/libvirt/lxc || return 1 - checkpath --directory /etc/libvirt/nwfilter || return 1 - [ -L /etc/libvirt/qemu ] || - checkpath --directory /etc/libvirt/qemu || return 1 - [ -L /etc/libvirt/storage ] || - checkpath --directory /etc/libvirt/storage || return 1 -}