commit: c9b6391550bfcf0b1aaab11cbfd3a1b4e6e847e5 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Mon Apr 6 17:41:08 2020 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Mon Apr 6 17:46:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b63915
app-emulation/libvirt: remove --listen parameter for systemd unit files Upstream-Changes: https://www.redhat.com/archives/libvir-list/2019-August/msg01070.html Closes: https://bugs.gentoo.org/716452 Package-Manager: Portage-2.3.96, Repoman-2.3.22 RepoMan-Options: --force Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> .../libvirt/files/{README.gentoo-r2 => README.gentoo-r3} | 4 ++-- app-emulation/libvirt/files/libvirtd.service.conf | 10 ---------- .../{libvirt-6.0.0-r2.ebuild => libvirt-6.0.0-r3.ebuild} | 5 +---- .../libvirt/{libvirt-6.2.0.ebuild => libvirt-6.1.0-r1.ebuild} | 5 +---- .../libvirt/{libvirt-6.1.0.ebuild => libvirt-6.2.0-r1.ebuild} | 5 +---- app-emulation/libvirt/libvirt-9999.ebuild | 5 +---- 6 files changed, 6 insertions(+), 28 deletions(-) diff --git a/app-emulation/libvirt/files/README.gentoo-r2 b/app-emulation/libvirt/files/README.gentoo-r3 similarity index 94% rename from app-emulation/libvirt/files/README.gentoo-r2 rename to app-emulation/libvirt/files/README.gentoo-r3 index 6d6fb18ed3c..1fec12f0c02 100644 --- a/app-emulation/libvirt/files/README.gentoo-r2 +++ b/app-emulation/libvirt/files/README.gentoo-r3 @@ -36,8 +36,8 @@ For openrc users: For systemd users: - Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf - to control the '--listen' parameter for libvirtd. + The '--listen' parameter is unavailable when libvirtd is run as a + systemd unit. The configuration for the 'libvirt-guests.service' is found under /etc/libvirt/libvirt-guests.conf" diff --git a/app-emulation/libvirt/files/libvirtd.service.conf b/app-emulation/libvirt/files/libvirtd.service.conf deleted file mode 100644 index f08792260b7..00000000000 --- a/app-emulation/libvirt/files/libvirtd.service.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Uncomment the following three lines to start libvirtd with the '--listen' -# directive such that it listens for TCP/IP connections (honoring the -# listen_tls and listen_tcp settings in /etc/libvirt/libvirtd.conf). If -# libvirtd is started without the '--listen' parameter, network connection -# (for the daemon) is globally disabled: - -# [Service] -# ExecStart= -# ExecStart=/usr/sbin/libvirtd --listen - diff --git a/app-emulation/libvirt/libvirt-6.0.0-r2.ebuild b/app-emulation/libvirt/libvirt-6.0.0-r3.ebuild similarity index 98% rename from app-emulation/libvirt/libvirt-6.0.0-r2.ebuild rename to app-emulation/libvirt/libvirt-6.0.0-r3.ebuild index 80289b5c551..93f45ac0a1c 100644 --- a/app-emulation/libvirt/libvirt-6.0.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-6.0.0-r3.ebuild @@ -326,9 +326,6 @@ my_src_install() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf newinitd "${S}/libvirtd.init" libvirtd @@ -339,7 +336,7 @@ my_src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc } diff --git a/app-emulation/libvirt/libvirt-6.2.0.ebuild b/app-emulation/libvirt/libvirt-6.1.0-r1.ebuild similarity index 98% rename from app-emulation/libvirt/libvirt-6.2.0.ebuild rename to app-emulation/libvirt/libvirt-6.1.0-r1.ebuild index 27614710885..a387149a364 100644 --- a/app-emulation/libvirt/libvirt-6.2.0.ebuild +++ b/app-emulation/libvirt/libvirt-6.1.0-r1.ebuild @@ -324,9 +324,6 @@ my_src_install() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf newinitd "${S}/libvirtd.init" libvirtd @@ -337,7 +334,7 @@ my_src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc } diff --git a/app-emulation/libvirt/libvirt-6.1.0.ebuild b/app-emulation/libvirt/libvirt-6.2.0-r1.ebuild similarity index 98% rename from app-emulation/libvirt/libvirt-6.1.0.ebuild rename to app-emulation/libvirt/libvirt-6.2.0-r1.ebuild index 27614710885..a387149a364 100644 --- a/app-emulation/libvirt/libvirt-6.1.0.ebuild +++ b/app-emulation/libvirt/libvirt-6.2.0-r1.ebuild @@ -324,9 +324,6 @@ my_src_install() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf newinitd "${S}/libvirtd.init" libvirtd @@ -337,7 +334,7 @@ my_src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc } diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 4e84e0dcb8f..9d895175578 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -323,9 +323,6 @@ my_src_install() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf newinitd "${S}/libvirtd.init" libvirtd @@ -336,7 +333,7 @@ my_src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc }
