app-emulation/libvirt: fix up service dependencies

libvirtd requires virtlogd so this adds it as a 'need'. Change the other services to be on their own line to be a bit more clear in the future. Change failure to start due to missing directories into a test and create rather than failure. Gentoo-Bug: 571084 Package-Manager: portage-2.2.26 Signed-off-by: Doug Goldstein <[email protected]> Signed-off-by: Matthias Maier <[email protected]>
johu · Jan 7, 2016 · c5f6db5 · c5f6db5
1 parent 6036043
commit c5f6db5
Show file tree

Hide file tree

Showing 2 changed files with 419 additions and 0 deletions.
diff --git a/app-emulation/libvirt/files/libvirtd.init-r16 b/app-emulation/libvirt/files/libvirtd.init-r16
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="/var/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
+	checkpath --directory /etc/libvirt/qemu || return 1
+	checkpath --directory /etc/libvirt/storage || return 1
+}