From unknown Sun Sep 07 01:27:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 0/3] Support guix system describe and provenance for the Hurd Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jun 2020 13:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42122@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159343897317939 (code B ref -1); Mon, 29 Jun 2020 13:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jun 2020 13:56:13 +0000 Received: from localhost ([127.0.0.1]:48999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuGT-0004fD-UM for submit@debbugs.gnu.org; Mon, 29 Jun 2020 09:56:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:40174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuGS-0004f7-AS for submit@debbugs.gnu.org; Mon, 29 Jun 2020 09:56:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpuGS-0005AR-0Q for guix-patches@gnu.org; Mon, 29 Jun 2020 09:56:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59787) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpuGQ-0002QO-DX; Mon, 29 Jun 2020 09:56:02 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=50074 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jpuGP-0005WJ-Hd; Mon, 29 Jun 2020 09:56:02 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 15:55:59 +0200 Message-Id: <20200629135559.12696-1-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (---) Hello Guix! This series supports using "guix system describe" on a Chilhurd, showing provenance info when the disk-image was built using --save-provenance. Janneke Jan (janneke) Nieuwenhuizen (3): system: 'read-boot-parameters' fixes for multiboot. services: system-service-type: Add entries support for the Hurd. guix system: "describe" displays multiboot info. gnu/system.scm | 79 ++++++++++++++++++++++++----------------- guix/scripts/system.scm | 5 +++ 2 files changed, 52 insertions(+), 32 deletions(-) -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com From unknown Sun Sep 07 01:27:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot. References: <20200629135559.12696-1-janneke@gnu.org> In-Reply-To: <20200629135559.12696-1-janneke@gnu.org> Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jun 2020 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159343910718199 (code B ref 42122); Mon, 29 Jun 2020 13:59:02 +0000 Received: (at 42122) by debbugs.gnu.org; 29 Jun 2020 13:58:27 +0000 Received: from localhost ([127.0.0.1]:49005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIl-0004jS-3k for submit@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIj-0004j3-0p for 42122@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:26 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59810) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpuId-0002l7-NW; Mon, 29 Jun 2020 09:58:19 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=50092 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jpuIc-0000l9-ND; Mon, 29 Jun 2020 09:58:19 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 15:58:15 +0200 Message-Id: <20200629135817.12784-1-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (---) * gnu/system.scm (read-boot-parameters): Allow initrd to be unset. Return only value for multiboot-modules instead of (key value). --- gnu/system.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 44baacee7b..a6a9c958e6 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -351,9 +351,13 @@ file system labels." (('initrd ('string-append directory file)) ;the old format (string-append directory file)) (('initrd (? string? file)) - file))) + file) + (#f #f))) - (multiboot-modules (or (assq 'multiboot-modules rest) '())) + (multiboot-modules + (match (assq 'multiboot-modules rest) + ((_ args) args) + (#f '()))) (store-device ;; Linux device names like "/dev/sda1" are not suitable GRUB device -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com From unknown Sun Sep 07 01:27:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 2/3] services: system-service-type: Add entries support for the Hurd. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jun 2020 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159343910718205 (code B ref 42122); Mon, 29 Jun 2020 13:59:02 +0000 Received: (at 42122) by debbugs.gnu.org; 29 Jun 2020 13:58:27 +0000 Received: from localhost ([127.0.0.1]:49007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIl-0004jU-Di for submit@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIk-0004j5-9T for 42122@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:26 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59811) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpuIe-0002lE-Uu; Mon, 29 Jun 2020 09:58:20 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=50092 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jpuIe-0000l9-3P; Mon, 29 Jun 2020 09:58:20 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 15:58:16 +0200 Message-Id: <20200629135817.12784-2-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200629135817.12784-1-janneke@gnu.org> References: <20200629135817.12784-1-janneke@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (---) When creating a disk-image using --save-provenance, "guix system describe" now works. * gnu/system.scm (operating-system-directory-base-entries): Add conditional "hurd" parameter, make "initrd" parameter conditional. (hurd-default-essential-services): Use them. (operating-system-boot-parameters-file): Only add 'initrd' when set. --- gnu/system.scm | 71 +++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index a6a9c958e6..d4641cc9b0 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -537,22 +537,26 @@ possible (that is if there's a LINUX keyword argument in the build system)." value of the SYSTEM-SERVICE-TYPE service." (let* ((locale (operating-system-locale-directory os)) (kernel (operating-system-kernel os)) + (hurd (operating-system-hurd os)) (modules (operating-system-kernel-loadable-modules os)) - (kernel (profile - (content (packages->manifest - (cons kernel - (map (lambda (module) - (if (package? module) - (package-for-kernel kernel - module) - module)) - modules)))) - (hooks (list linux-module-database)))) - (initrd (operating-system-initrd-file os)) + (kernel (if hurd + kernel + (profile + (content (packages->manifest + (cons kernel + (map (lambda (module) + (if (package? module) + (package-for-kernel kernel + module) + module)) + modules)))) + (hooks (list linux-module-database))))) + (initrd (and (not hurd) (operating-system-initrd-file os))) (params (operating-system-boot-parameters-file os))) `(("kernel" ,kernel) + ,@(if hurd `(("hurd" ,hurd)) '()) ("parameters" ,params) - ("initrd" ,initrd) + ,@(if initrd `(("initrd" ,initrd)) '()) ("locale" ,locale)))) ;used by libc (define (operating-system-default-essential-services os) @@ -604,23 +608,24 @@ bookkeeping." (operating-system-firmware os))))))) (define (hurd-default-essential-services os) - (list (service system-service-type '()) - %boot-service - %hurd-startup-service - %activation-service - %shepherd-root-service - (service user-processes-service-type) - (account-service (append (operating-system-accounts os) - (operating-system-groups os)) - (operating-system-skeletons os)) - (root-file-system-service) - (service file-system-service-type '()) - (service fstab-service-type - (filter file-system-needed-for-boot? - (operating-system-file-systems os))) - (pam-root-service (operating-system-pam-services os)) - (operating-system-etc-service os) - (service profile-service-type (operating-system-packages os)))) + (let ((entries (operating-system-directory-base-entries os))) + (list (service system-service-type entries) + %boot-service + %hurd-startup-service + %activation-service + %shepherd-root-service + (service user-processes-service-type) + (account-service (append (operating-system-accounts os) + (operating-system-groups os)) + (operating-system-skeletons os)) + (root-file-system-service) + (service file-system-service-type '()) + (service fstab-service-type + (filter file-system-needed-for-boot? + (operating-system-file-systems os))) + (pam-root-service (operating-system-pam-services os)) + (operating-system-etc-service os) + (service profile-service-type (operating-system-packages os))))) (define* (operating-system-services os) "Return all the services of OS, including \"essential\" services." @@ -1276,7 +1281,13 @@ being stored into the \"parameters\" file)." (kernel #$(boot-parameters-kernel params)) (kernel-arguments #$(boot-parameters-kernel-arguments params)) - (initrd #$(boot-parameters-initrd params)) + #$@(if (boot-parameters-initrd params) + #~((initrd #$(boot-parameters-initrd params))) + #~()) + #$@(if (pair? (boot-parameters-multiboot-modules params)) + #~((multiboot-modules + #$(boot-parameters-multiboot-modules params))) + #~()) (bootloader-name #$(boot-parameters-bootloader-name params)) (bootloader-menu-entries #$(map menu-entry->sexp -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com From unknown Sun Sep 07 01:27:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 3/3] guix system: "describe" displays multiboot info. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jun 2020 13:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159343911018219 (code B ref 42122); Mon, 29 Jun 2020 13:59:03 +0000 Received: (at 42122) by debbugs.gnu.org; 29 Jun 2020 13:58:30 +0000 Received: from localhost ([127.0.0.1]:49010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIn-0004jn-Rc for submit@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuIl-0004jA-UA for 42122@debbugs.gnu.org; Mon, 29 Jun 2020 09:58:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59812) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpuIg-0002lO-BU; Mon, 29 Jun 2020 09:58:22 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=50092 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jpuIf-0000l9-B9; Mon, 29 Jun 2020 09:58:21 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 29 Jun 2020 15:58:17 +0200 Message-Id: <20200629135817.12784-3-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200629135817.12784-1-janneke@gnu.org> References: <20200629135817.12784-1-janneke@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (---) * guix/scripts/system.scm (display-system-generation): Display multiboot-modules commands if set. --- guix/scripts/system.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index d9cf45da23..7f062452ac 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -480,6 +480,7 @@ list of services." (uuid->string root) root)) (kernel (boot-parameters-kernel params)) + (multiboot-modules (boot-parameters-multiboot-modules params)) (provenance (catch 'system-error (lambda () (call-with-input-file @@ -509,6 +510,10 @@ list of services." (format #t (G_ " kernel: ~a~%") kernel) + (when (pair? multiboot-modules) + (format #t (G_ " multiboot: ~a~%") + (string-join (map car multiboot-modules) "\n "))) + (match provenance (#f #t) (('provenance ('version 0) -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com From unknown Sun Sep 07 01:27:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Jul 2020 21:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Jan \(janneke\) Nieuwenhuizen" Cc: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159372618618381 (code B ref 42122); Thu, 02 Jul 2020 21:44:02 +0000 Received: (at 42122) by debbugs.gnu.org; 2 Jul 2020 21:43:06 +0000 Received: from localhost ([127.0.0.1]:55860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jr6z4-0004mP-CL for submit@debbugs.gnu.org; Thu, 02 Jul 2020 17:43:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jr6z3-0004lv-74 for 42122@debbugs.gnu.org; Thu, 02 Jul 2020 17:43:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41809) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jr6yx-00082a-Ul; Thu, 02 Jul 2020 17:42:59 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59852 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jr6yx-0003bk-F2; Thu, 02 Jul 2020 17:42:59 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200629135559.12696-1-janneke@gnu.org> <20200629135817.12784-1-janneke@gnu.org> Date: Thu, 02 Jul 2020 23:42:58 +0200 In-Reply-To: <20200629135817.12784-1-janneke@gnu.org> (Jan Nieuwenhuizen's message of "Mon, 29 Jun 2020 15:58:15 +0200") Message-ID: <87v9j5pp99.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 (---) Hi! "Jan (janneke) Nieuwenhuizen" skribis: > * gnu/system.scm (read-boot-parameters): Allow initrd to be unset. Return s/unset/missing/, right? > only value for multiboot-modules instead of (key value). > --- > gnu/system.scm | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/gnu/system.scm b/gnu/system.scm > index 44baacee7b..a6a9c958e6 100644 > --- a/gnu/system.scm > +++ b/gnu/system.scm > @@ -351,9 +351,13 @@ file system labels." > (('initrd ('string-append directory file)) ;the old format > (string-append directory file)) > (('initrd (? string? file)) > - file))) > + file) > + (#f #f))) OK. > - (multiboot-modules (or (assq 'multiboot-modules rest) '())) > + (multiboot-modules > + (match (assq 'multiboot-modules rest) > + ((_ args) args) > + (#f '()))) Since this second hunk is a bug fix, I=E2=80=99d rather make it a separate commit. Otherwise LGTM! From unknown Sun Sep 07 01:27:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 2/3] services: system-service-type: Add entries support for the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Jul 2020 21:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Jan \(janneke\) Nieuwenhuizen" Cc: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159372664819096 (code B ref 42122); Thu, 02 Jul 2020 21:51:01 +0000 Received: (at 42122) by debbugs.gnu.org; 2 Jul 2020 21:50:48 +0000 Received: from localhost ([127.0.0.1]:55876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jr76W-0004xw-1G for submit@debbugs.gnu.org; Thu, 02 Jul 2020 17:50:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jr76T-0004xi-P4 for 42122@debbugs.gnu.org; Thu, 02 Jul 2020 17:50:46 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42005) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jr76O-00029P-Fg; Thu, 02 Jul 2020 17:50:40 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59968 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jr76O-00046G-44; Thu, 02 Jul 2020 17:50:40 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200629135817.12784-1-janneke@gnu.org> <20200629135817.12784-2-janneke@gnu.org> Date: Thu, 02 Jul 2020 23:50:38 +0200 In-Reply-To: <20200629135817.12784-2-janneke@gnu.org> (Jan Nieuwenhuizen's message of "Mon, 29 Jun 2020 15:58:16 +0200") Message-ID: <87r1ttpowh.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 (---) "Jan (janneke) Nieuwenhuizen" skribis: > When creating a disk-image using --save-provenance, "guix system describe" > now works. > > * gnu/system.scm (operating-system-directory-base-entries): Add condition= al > "hurd" parameter, make "initrd" parameter conditional. > (hurd-default-essential-services): Use them. > (operating-system-boot-parameters-file): Only add 'initrd' when set. LGTM! I hadn=E2=80=99t realized there were no =E2=80=98system=E2=80=99 ent= ries. > + (let ((entries (operating-system-directory-base-entries os))) > + (list (service system-service-type entries) ^ One missing space for indentation. :-) From unknown Sun Sep 07 01:27:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 3/3] guix system: "describe" displays multiboot info. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Jul 2020 21:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Jan \(janneke\) Nieuwenhuizen" Cc: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159372672619239 (code B ref 42122); Thu, 02 Jul 2020 21:53:02 +0000 Received: (at 42122) by debbugs.gnu.org; 2 Jul 2020 21:52:06 +0000 Received: from localhost ([127.0.0.1]:55880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jr77k-00050D-BG for submit@debbugs.gnu.org; Thu, 02 Jul 2020 17:52:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jr77j-0004zi-1U for 42122@debbugs.gnu.org; Thu, 02 Jul 2020 17:52:03 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42033) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jr77d-0002VM-OU; Thu, 02 Jul 2020 17:51:57 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59970 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jr77d-0004Fh-6e; Thu, 02 Jul 2020 17:51:57 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200629135817.12784-1-janneke@gnu.org> <20200629135817.12784-3-janneke@gnu.org> Date: Thu, 02 Jul 2020 23:51:56 +0200 In-Reply-To: <20200629135817.12784-3-janneke@gnu.org> (Jan Nieuwenhuizen's message of "Mon, 29 Jun 2020 15:58:17 +0200") Message-ID: <87mu4hpoub.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 (---) "Jan (janneke) Nieuwenhuizen" skribis: > * guix/scripts/system.scm (display-system-generation): Display > multiboot-modules commands if set. [...] > + (when (pair? multiboot-modules) > + (format #t (G_ " multiboot: ~a~%") > + (string-join (map car multiboot-modules) "\n "))) Rather like: (match multiboot-modules (() #f) (((modules . _) ...) =E2=80=A6 (string-join modules "\n ") =E2=80=A6)) Otherwise LGTM, thank you! Ludo=E2=80=99. From unknown Sun Sep 07 01:27:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 1/3] system: 'read-boot-parameters' fixes for multiboot. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Jul 2020 07:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159376213712245 (code B ref 42122); Fri, 03 Jul 2020 07:43:02 +0000 Received: (at 42122) by debbugs.gnu.org; 3 Jul 2020 07:42:17 +0000 Received: from localhost ([127.0.0.1]:56337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrGKv-0003BQ-Ab for submit@debbugs.gnu.org; Fri, 03 Jul 2020 03:42:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrGKs-0003BD-7w for 42122@debbugs.gnu.org; Fri, 03 Jul 2020 03:42:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49391) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrGKl-0002XB-Lh; Fri, 03 Jul 2020 03:42:07 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=36788 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jrGKj-0006Nt-Qw; Fri, 03 Jul 2020 03:42:06 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <20200629135559.12696-1-janneke@gnu.org> <20200629135817.12784-1-janneke@gnu.org> <87v9j5pp99.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Fri, 03 Jul 2020 09:42:03 +0200 In-Reply-To: <87v9j5pp99.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 02 Jul 2020 23:42:58 +0200") Message-ID: <878sg12gfo.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 (---) Ludovic Court=C3=A8s writes: Hi! > "Jan (janneke) Nieuwenhuizen" skribis: > >> * gnu/system.scm (read-boot-parameters): Allow initrd to be unset. Retu= rn > > s/unset/missing/, right? Yes; that's more clear and what I meant. >> only value for multiboot-modules instead of (key value). >> --- >> gnu/system.scm | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/gnu/system.scm b/gnu/system.scm >> index 44baacee7b..a6a9c958e6 100644 >> --- a/gnu/system.scm >> +++ b/gnu/system.scm >> @@ -351,9 +351,13 @@ file system labels." >> (('initrd ('string-append directory file)) ;the old format >> (string-append directory file)) >> (('initrd (? string? file)) >> - file))) >> + file) >> + (#f #f))) > > OK. =3D> to second patch. >> - (multiboot-modules (or (assq 'multiboot-modules rest) '())) >> + (multiboot-modules >> + (match (assq 'multiboot-modules rest) >> + ((_ args) args) >> + (#f '()))) > > Since this second hunk is a bug fix, I=E2=80=99d rather make it a separate > commit. Great, =3D> to first bugfix patch. > Otherwise LGTM! Janneke --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com From unknown Sun Sep 07 01:27:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42122] [PATCH 2/3] services: system-service-type: Add entries support for the Hurd. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Jul 2020 07:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 42122@debbugs.gnu.org Received: via spool by 42122-submit@debbugs.gnu.org id=B42122.159376214812271 (code B ref 42122); Fri, 03 Jul 2020 07:43:02 +0000 Received: (at 42122) by debbugs.gnu.org; 3 Jul 2020 07:42:28 +0000 Received: from localhost ([127.0.0.1]:56340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrGL6-0003Bq-KV for submit@debbugs.gnu.org; Fri, 03 Jul 2020 03:42:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrGL4-0003Be-Dy for 42122@debbugs.gnu.org; Fri, 03 Jul 2020 03:42:26 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49395) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrGKz-0002bR-5d; Fri, 03 Jul 2020 03:42:21 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=36790 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jrGKy-000796-GG; Fri, 03 Jul 2020 03:42:20 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <20200629135817.12784-1-janneke@gnu.org> <20200629135817.12784-2-janneke@gnu.org> <87r1ttpowh.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Fri, 03 Jul 2020 09:42:19 +0200 In-Reply-To: <87r1ttpowh.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 02 Jul 2020 23:50:38 +0200") Message-ID: <877dvl2gf8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 (---) Ludovic Court=C3=A8s writes: > "Jan (janneke) Nieuwenhuizen" skribis: > >> When creating a disk-image using --save-provenance, "guix system describ= e" >> now works. >> >> * gnu/system.scm (operating-system-directory-base-entries): Add conditio= nal >> "hurd" parameter, make "initrd" parameter conditional. >> (hurd-default-essential-services): Use them. >> (operating-system-boot-parameters-file): Only add 'initrd' when set. > > LGTM! I hadn=E2=80=99t realized there were no =E2=80=98system=E2=80=99 e= ntries. Yeah, I guess they were present once and removed during our cross-build woes to make a smaller patch series. Anyway... >> + (let ((entries (operating-system-directory-base-entries os))) >> + (list (service system-service-type entries) > ^ > One missing space for indentation. :-) Oh! Thanks. Fixed. Janneke --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com From unknown Sun Sep 07 01:27:56 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: "Jan (janneke) Nieuwenhuizen" Subject: bug#42122: closed (Re: [bug#42122] [PATCH 3/3] guix system: "describe" displays multiboot info.) Message-ID: References: <875zb52get.fsf@gnu.org> <20200629135559.12696-1-janneke@gnu.org> X-Gnu-PR-Message: they-closed 42122 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 42122@debbugs.gnu.org Date: Fri, 03 Jul 2020 07:43:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1593762183-12342-1" This is a multi-part message in MIME format... ------------=_1593762183-12342-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #42122: [PATCH 0/3] Support guix system describe and provenance for the Hurd which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 42122@debbugs.gnu.org. --=20 42122: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D42122 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1593762183-12342-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 42122-done) by debbugs.gnu.org; 3 Jul 2020 07:42:44 +0000 Received: from localhost ([127.0.0.1]:56343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrGLL-0003CK-UB for submit@debbugs.gnu.org; Fri, 03 Jul 2020 03:42:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrGLJ-0003C6-QA for 42122-done@debbugs.gnu.org; Fri, 03 Jul 2020 03:42:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49398) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrGLE-0002ej-Ha; Fri, 03 Jul 2020 03:42:36 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=36792 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jrGLD-0000Bz-P3; Fri, 03 Jul 2020 03:42:36 -0400 From: Jan Nieuwenhuizen To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#42122] [PATCH 3/3] guix system: "describe" displays multiboot info. Organization: AvatarAcademy.nl References: <20200629135817.12784-1-janneke@gnu.org> <20200629135817.12784-3-janneke@gnu.org> <87mu4hpoub.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Fri, 03 Jul 2020 09:42:34 +0200 In-Reply-To: <87mu4hpoub.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 02 Jul 2020 23:51:56 +0200") Message-ID: <875zb52get.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42122-done Cc: 42122-done@debbugs.gnu.org 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 (---) Ludovic Court=C3=A8s writes: Hi! > "Jan (janneke) Nieuwenhuizen" skribis: > >> * guix/scripts/system.scm (display-system-generation): Display >> multiboot-modules commands if set. > > [...] > >> + (when (pair? multiboot-modules) >> + (format #t (G_ " multiboot: ~a~%") >> + (string-join (map car multiboot-modules) "\n "))) > > Rather like: > > (match multiboot-modules > (() #f) > (((modules . _) ...) > =E2=80=A6 (string-join modules "\n ") =E2=80=A6)) > > Otherwise LGTM, thank you! Thanks, done! Pushed series to master as 28febfafbb23561624cc5c4ac8ed581f1f867f70 Janneke --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com ------------=_1593762183-12342-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 29 Jun 2020 13:56:13 +0000 Received: from localhost ([127.0.0.1]:48999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuGT-0004fD-UM for submit@debbugs.gnu.org; Mon, 29 Jun 2020 09:56:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:40174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpuGS-0004f7-AS for submit@debbugs.gnu.org; Mon, 29 Jun 2020 09:56:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpuGS-0005AR-0Q for guix-patches@gnu.org; Mon, 29 Jun 2020 09:56:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59787) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpuGQ-0002QO-DX; Mon, 29 Jun 2020 09:56:02 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=50074 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jpuGP-0005WJ-Hd; Mon, 29 Jun 2020 09:56:02 -0400 From: "Jan (janneke) Nieuwenhuizen" To: guix-patches@gnu.org Subject: [PATCH 0/3] Support guix system describe and provenance for the Hurd Date: Mon, 29 Jun 2020 15:55:59 +0200 Message-Id: <20200629135559.12696-1-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit 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 (---) Hello Guix! This series supports using "guix system describe" on a Chilhurd, showing provenance info when the disk-image was built using --save-provenance. Janneke Jan (janneke) Nieuwenhuizen (3): system: 'read-boot-parameters' fixes for multiboot. services: system-service-type: Add entries support for the Hurd. guix system: "describe" displays multiboot info. gnu/system.scm | 79 ++++++++++++++++++++++++----------------- guix/scripts/system.scm | 5 +++ 2 files changed, 52 insertions(+), 32 deletions(-) -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com ------------=_1593762183-12342-1--