commit: 7651e9a1460c7024afcf4ed1a514b665f67d213d
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 9 18:52:44 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jul 9 18:54:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7651e9a1
app-emulation/libvirt: also drop avahi use flag from init file
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-emulation/libvirt/files/libvirtd.init-r18 | 35 ++++++++++++++++++++++
...ibvirt-5.5.0.ebuild => libvirt-5.5.0-r1.ebuild} | 2 +-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/app-emulation/libvirt/files/libvirtd.init-r18
b/app-emulation/libvirt/files/libvirtd.init-r18
new file mode 100644
index 00000000000..23988dd1b17
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.init-r18
@@ -0,0 +1,35 @@
+#!/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_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
+}
diff --git a/app-emulation/libvirt/libvirt-5.5.0.ebuild
b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
similarity index 99%
rename from app-emulation/libvirt/libvirt-5.5.0.ebuild
rename to app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
index 5deb92b7628..b5f8f50ca09 100644
--- a/app-emulation/libvirt/libvirt-5.5.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@@ -235,7 +235,7 @@ src_prepare() {
fi
# Tweak the init script:
- cp "${FILESDIR}/libvirtd.init-r17" "${S}/libvirtd.init" || die
+ cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
