From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 694A4138335 for ; Tue, 9 Jul 2019 18:55:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87CE7E0839; Tue, 9 Jul 2019 18:54:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A858E0839 for ; Tue, 9 Jul 2019 18:54:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4728934748B for ; Tue, 9 Jul 2019 18:54:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFCD86D5 for ; Tue, 9 Jul 2019 18:54:56 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1562698459.7651e9a1460c7024afcf4ed1a514b665f67d213d.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/, app-emulation/libvirt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/files/libvirtd.init-r18 app-emulation/libvirt/libvirt-5.5.0-r1.ebuild app-emulation/libvirt/libvirt-5.5.0.ebuild X-VCS-Directories: app-emulation/libvirt/files/ app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 7651e9a1460c7024afcf4ed1a514b665f67d213d X-VCS-Branch: master Date: Tue, 9 Jul 2019 18:54:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ec9abdb0-d135-4635-bdcb-3824f736fea7 X-Archives-Hash: 2eedad263def1b0300069c15103d31c4 commit: 7651e9a1460c7024afcf4ed1a514b665f67d213d Author: Matthias Maier gentoo org> AuthorDate: Tue Jul 9 18:52:44 2019 +0000 Commit: Matthias Maier gentoo 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 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' '')/" \