From mboxrd@z Thu Jan 1 00:00:00 1970 From: iyzsong@member.fsf.org (=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?=) Subject: bug#37209: [PATCH] gnu: libvirt: Don't wrap with PATH Date: Wed, 28 Aug 2019 21:05:25 +0800 Message-ID: <87y2zdh23u.fsf@member.fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:60722) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2xeG-0006XF-CL for bug-guix@gnu.org; Wed, 28 Aug 2019 09:06:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2xeF-0007oa-4e for bug-guix@gnu.org; Wed, 28 Aug 2019 09:06:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41118) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2xeF-0007oO-1W for bug-guix@gnu.org; Wed, 28 Aug 2019 09:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i2xeE-00028J-S1 for bug-guix@gnu.org; Wed, 28 Aug 2019 09:06:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:60599) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2xdp-0006Gx-JI for bug-guix@gnu.org; Wed, 28 Aug 2019 09:05:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2xdo-0007VX-9c for bug-guix@gnu.org; Wed, 28 Aug 2019 09:05:37 -0400 Received: from rezeros.cc ([2001:19f0:7001:2f3e:5400:ff:fe84:e55d]:53188) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i2xdn-0007Sy-Rl for bug-guix@gnu.org; Wed, 28 Aug 2019 09:05:36 -0400 List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 37209@debbugs.gnu.org --=-=-= Content-Type: text/plain Hello, this patch will make libvirt use "/run/current-system/profile/bin/qemu-system-x86_64" in machine's definition, and it can use 'ovs-vsctl' in PATH: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-libvirt-Don-t-wrap-with-PATH.patch >From e463ef6952009a46c96981df0647cee414fb71a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 28 Aug 2019 20:49:40 +0800 Subject: [PATCH] gnu: libvirt: Don't wrap with PATH. This reverts commit 903e051a71467bc96a054c9b4ed89348fdae8977 to fix . The full path of the 'ip' command is already embedded, and we want to search 'qemu' in PATH. * gnu/packages/virtualization.scm (libvirt): Remove 'wrap-libvirtd phase. Add configure flags to run qemu as 'nobody:kvm'. * gnu/services/virtualization.scm (libvirt-service-type): Add 'qemu' to the system profile. --- gnu/packages/virtualization.scm | 17 +++++------------ gnu/services/virtualization.scm | 6 ++++-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 26477714e4..f46c31df1f 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -401,7 +401,10 @@ manage system or application containers.") (build-system gnu-build-system) (arguments `(#:configure-flags - (list "--with-polkit" + (list "--with-qemu" + "--with-qemu-user=nobody" + "--with-qemu-group=kvm" + "--with-polkit" (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" ,name "-" ,version) "--sysconfdir=/etc" @@ -431,23 +434,13 @@ manage system or application containers.") (apply invoke "make" "install" "sysconfdir=/tmp/etc" "localstatedir=/tmp/var" - make-flags))) - (add-after 'install 'wrap-libvirtd - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/sbin/libvirtd") - `("PATH" = (,(string-append (assoc-ref inputs "iproute") - "/sbin") - ,(string-append (assoc-ref inputs "qemu") - "/bin")))) - #t)))))) + make-flags)))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) ("libpciaccess" ,libpciaccess) ("gnutls" ,gnutls) ("dbus" ,dbus) - ("qemu" ,qemu) ("libpcap" ,libpcap) ("libnl" ,libnl) ("libuuid" ,util-linux) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 705ed84d06..03aedd326c 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -442,8 +442,10 @@ potential infinite waits blocking libvirt.")) (service-extension polkit-service-type (compose list libvirt-configuration-libvirt)) (service-extension profile-service-type - (compose list - libvirt-configuration-libvirt)) + (lambda (config) + (list + (libvirt-configuration-libvirt config) + qemu))) (service-extension activation-service-type %libvirt-activation) (service-extension shepherd-root-service-type -- 2.19.2 --=-=-=--