From unknown Sat Jun 14 03:54:54 2025 X-Loop: help-debbugs@gnu.org Subject: bug#37209: [PATCH] gnu: libvirt: Don't wrap with PATH Resent-From: iyzsong@member.fsf.org (=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?=) Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 28 Aug 2019 13:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37209 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 37209@debbugs.gnu.org Cc: Tobias Geerinckx-Rice , Christopher Baines X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15669975448156 (code B ref -1); Wed, 28 Aug 2019 13:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Aug 2019 13:05:44 +0000 Received: from localhost ([127.0.0.1]:49937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i2xdw-00027U-Eb for submit@debbugs.gnu.org; Wed, 28 Aug 2019 09:05:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:59534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i2xdr-00027G-6U for submit@debbugs.gnu.org; Wed, 28 Aug 2019 09:05:39 -0400 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, FROM_EXCESS_BASE64, URIBL_BLOCKED autolearn=disabled version=3.3.2 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 Received: from localhost (2409:8a62:378:85e0:e7a8:a500:b040:7fb6 [IPv6:2409:8a62:378:85e0:e7a8:a500:b040:7fb6]) by rezeros.cc (OpenSMTPD) with ESMTPSA id 51c63de9 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Wed, 28 Aug 2019 13:05:32 +0000 (UTC) Received: from gift (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 1042b5d8; Wed, 28 Aug 2019 13:05:25 +0000 (UTC) From: iyzsong@member.fsf.org (=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?=) 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="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:19f0:7001:2f3e:5400:ff:fe84:e55d X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= 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 --=-=-=-- From unknown Sat Jun 14 03:54:54 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: iyzsong@member.fsf.org (=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?=) Subject: bug#37209: closed (Re: bug#37209: [PATCH] gnu: libvirt: Don't wrap with PATH) Message-ID: References: <874l1jxeqn.fsf@member.fsf.org> <87y2zdh23u.fsf@member.fsf.org> X-Gnu-PR-Message: they-closed 37209 X-Gnu-PR-Package: guix X-Gnu-PR-Keywords: patch Reply-To: 37209@debbugs.gnu.org Date: Wed, 11 Sep 2019 11:20:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1568200802-911-1" This is a multi-part message in MIME format... ------------=_1568200802-911-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #37209: [PATCH] gnu: libvirt: Don't wrap with PATH which was filed against the guix package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 37209@debbugs.gnu.org. --=20 37209: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D37209 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1568200802-911-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 37209-done) by debbugs.gnu.org; 11 Sep 2019 11:19:10 +0000 Received: from localhost ([127.0.0.1]:42066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i80eU-0000DY-Ib for submit@debbugs.gnu.org; Wed, 11 Sep 2019 07:19:10 -0400 Received: from rezeros.cc ([45.76.207.221]:60218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i80eS-0000DM-7F for 37209-done@debbugs.gnu.org; Wed, 11 Sep 2019 07:19:08 -0400 Received: from localhost (117.173.227.57 [117.173.227.57]) by rezeros.cc (OpenSMTPD) with ESMTPSA id 0ad7db26 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <37209-done@debbugs.gnu.org>; Wed, 11 Sep 2019 11:19:05 +0000 (UTC) Received: from gift (localhost.localdomain [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id ed735572 for <37209-done@debbugs.gnu.org>; Wed, 11 Sep 2019 11:18:56 +0000 (UTC) From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=) To: 37209-done@debbugs.gnu.org Subject: Re: bug#37209: [PATCH] gnu: libvirt: Don't wrap with PATH References: <87y2zdh23u.fsf@member.fsf.org> Date: Wed, 11 Sep 2019 19:18:56 +0800 In-Reply-To: <87y2zdh23u.fsf@member.fsf.org> (=?utf-8?B?IuWui+aWh+atpiIn?= =?utf-8?B?cw==?= message of "Wed, 28 Aug 2019 21:05:25 +0800") Message-ID: <874l1jxeqn.fsf@member.fsf.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 37209-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) iyzsong@member.fsf.org (=E5=AE=8B=E6=96=87=E6=AD=A6) writes: > 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: > >>>From e463ef6952009a46c96981df0647cee414fb71a6 Mon Sep 17 00:00:00 2001 > From: =3D?UTF-8?q?=3DE5=3DAE=3D8B=3DE6=3D96=3D87=3DE6=3DAD=3DA6?=3D > Date: Wed, 28 Aug 2019 20:49:40 +0800 > Subject: [PATCH] gnu: libvirt: Don't wrap with PATH. > Pushed, well I should sent it .. ------------=_1568200802-911-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 28 Aug 2019 13:05:44 +0000 Received: from localhost ([127.0.0.1]:49937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i2xdw-00027U-Eb for submit@debbugs.gnu.org; Wed, 28 Aug 2019 09:05:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:59534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i2xdr-00027G-6U for submit@debbugs.gnu.org; Wed, 28 Aug 2019 09:05:39 -0400 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, FROM_EXCESS_BASE64, URIBL_BLOCKED autolearn=disabled version=3.3.2 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 Received: from localhost (2409:8a62:378:85e0:e7a8:a500:b040:7fb6 [IPv6:2409:8a62:378:85e0:e7a8:a500:b040:7fb6]) by rezeros.cc (OpenSMTPD) with ESMTPSA id 51c63de9 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Wed, 28 Aug 2019 13:05:32 +0000 (UTC) Received: from gift (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 1042b5d8; Wed, 28 Aug 2019 13:05:25 +0000 (UTC) From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=) To: bug-guix@gnu.org Subject: [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="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:19f0:7001:2f3e:5400:ff:fe84:e55d X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Tobias Geerinckx-Rice , Christopher Baines X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= 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 --=-=-=-- ------------=_1568200802-911-1--