From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ED4VKW4L9V75cgAA0tVLHw (envelope-from ) for ; Thu, 25 Jun 2020 20:39:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id yAe7JG4L9V6acAAAbx9fmQ (envelope-from ) for ; Thu, 25 Jun 2020 20:39:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 40B86940308 for ; Thu, 25 Jun 2020 20:39:10 +0000 (UTC) Received: from localhost ([::1]:42022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joYeL-0001GT-83 for larch@yhetil.org; Thu, 25 Jun 2020 16:39:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joYeE-0001G9-09 for bug-guix@gnu.org; Thu, 25 Jun 2020 16:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joYeD-0004Ex-NT for bug-guix@gnu.org; Thu, 25 Jun 2020 16:39:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1joYeD-0001R2-LD for bug-guix@gnu.org; Thu, 25 Jun 2020 16:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#42047: [PATCH 2/3] image: hurd: Initialize root partition for the Hurd. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 25 Jun 2020 20:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42047 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 42047@debbugs.gnu.org Received: via spool by 42047-submit@debbugs.gnu.org id=B42047.15931175405509 (code B ref 42047); Thu, 25 Jun 2020 20:39:01 +0000 Received: (at 42047) by debbugs.gnu.org; 25 Jun 2020 20:39:00 +0000 Received: from localhost ([127.0.0.1]:41290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joYeC-0001Qn-1p for submit@debbugs.gnu.org; Thu, 25 Jun 2020 16:39:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joYeB-0001Qb-9P for 42047@debbugs.gnu.org; Thu, 25 Jun 2020 16:38:59 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44857) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joYe6-00047c-0n; Thu, 25 Jun 2020 16:38:54 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=46176 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1joYe5-0000HF-5U; Thu, 25 Jun 2020 16:38:53 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 25 Jun 2020 22:38:49 +0200 Message-Id: <20200625203850.25057-2-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200625203850.25057-1-janneke@gnu.org> References: <20200625203850.25057-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 X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: a/dMTwi5UElX This is a follow-up to commit b904b59ce592c89dfb4675a8c06757afed6738a0. * gnu/system/image.scm (hurd-initialize-root-partition): Move to ... * gnu/system/images/hurd.scm (hurd-initialize-root-partition): ... here. (hurd-disk-image): Use it. --- gnu/system/image.scm | 7 ------- gnu/system/images/hurd.scm | 9 ++++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index bb73aea65a..a4cc2d1ef9 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -96,13 +96,6 @@ (flags '(boot)) (initializer (gexp initialize-root-partition)))) -(define hurd-initialize-root-partition - #~(lambda* (#:rest args) - (apply initialize-root-partition - (append args - (list #:make-device-nodes - make-hurd-device-nodes))))) - (define efi-disk-image (image (format 'disk-image) diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index e5e120d49c..31942e7386 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -57,6 +57,13 @@ (password-authentication? #t))) %base-services/hurd)))) +(define hurd-initialize-root-partition + #~(lambda* (#:rest args) + (apply initialize-root-partition + (append args + (list #:make-device-nodes + make-hurd-device-nodes))))) + (define hurd-disk-image (image (format 'disk-image) @@ -69,7 +76,7 @@ (file-system "ext2") (file-system-options '("-o" "hurd" "-O" "ext_attr")) (flags '(boot)) - (initializer (gexp initialize-root-partition))))))) + (initializer hurd-initialize-root-partition)))))) (define hurd-barebones-disk-image (image -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com