From patchwork Wed Oct 30 14:30:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 69636 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 54FED27BBE9; Wed, 30 Oct 2024 14:34:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F0C7527BBE2 for ; Wed, 30 Oct 2024 14:34:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t69lz-0002EG-7M; Wed, 30 Oct 2024 10:34:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t69ls-0002BD-V4 for guix-patches@gnu.org; Wed, 30 Oct 2024 10:34:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t69ls-0003cj-KW; Wed, 30 Oct 2024 10:34:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=0ODjLb2KfeycSHUPsx7Dr3080lMtxc6nfVL+zj5fd2E=; b=CjgKzi1En1B0i84Egw4sMrkJH8INPx1+Yi4t1Lt6glTTGsl7/ms7JCom+101L48MWyQT9/OQ1DXmRfIfz0pgFXq5E5I9GOY6h9UkcJdZtA4kmSlLGvIOGh0cQ6F/ja5RcrRGHbupX6b8LsPR6eH9ll4eMCR6G5b5H8rSF0MXgwFT7a9bK7cYO65P3DZISMaMD0mZBmFcYcKDSy6h+nJ+uK9I8CmnfZf7QrarVtSncvPb3mFywDirIiBLOdL9tOXpsqCL+5ZKYT7190UXgSNQNy4vf23cfU5ecozTyOCYVDlE/kwzhcBwIyVaeOyji/EA8kI5tBAvm1mtFA445UW6nQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t69lr-0003y8-Sc; Wed, 30 Oct 2024 10:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73927] [PATCH v4 03/18] guix system: When installing the Hurd, create essential devices. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Wed, 30 Oct 2024 14:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73927 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73927@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 73927-submit@debbugs.gnu.org id=B73927.173029881615117 (code B ref 73927); Wed, 30 Oct 2024 14:34:03 +0000 Received: (at 73927) by debbugs.gnu.org; 30 Oct 2024 14:33:36 +0000 Received: from localhost ([127.0.0.1]:35321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69lP-0003ve-Uo for submit@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69lB-0003tm-9h for 73927@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:22 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t69iz-0003Kh-Cn; Wed, 30 Oct 2024 10:31:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=0ODjLb2KfeycSHUPsx7Dr3080lMtxc6nfVL+zj5fd2E=; b=YxU+tRC8u/wfMpXt869+ QzP14lN5LLtUJFi/DaFko7cSIJVV/eSI5rsQV6uKxt378AH4TX7RWrgCjekH/09O1QBQCasC872FP SkdHbDJbriOANAle8tmFXk05L1KETL4dzGXoICUlZ04iMbQhrgmSGRUYESftkNsEZMdHeO8UB9n9a kg132l1dx3YHRugUzmtqBhDHM199PvH6enAxs8w58bACHUzPsxMmz0f15univF2DG1M4as1HjpbYc PHy3Y7av97v4u406ey8nc8ZYyNlowCCH5wnVH10jNNwk0nWfgxRXTnr94ivMmWbNeWq/Wi9bezV3q r4uarQNeNZkOtw==; From: Janneke Nieuwenhuizen Date: Wed, 30 Oct 2024 15:30:32 +0100 Message-ID: <33174bdd45dd10b2aab98cd02d2f462ac91fc1e6.1730296564.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/scripts/system.scm (install): When installing the Hurd, invoke `make-hurd-device-nodes'. Change-Id: If84d5fe0b5bf4a93452f0b5241650f325d583543 --- guix/scripts/system.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 99c58f3812..7989b183ad 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Christopher Baines -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Brice Waegeneire @@ -63,6 +63,7 @@ (define-module (guix scripts system) #:autoload (guix progress) (progress-reporter/bar call-with-progress-reporter) #:use-module ((guix docker) #:select (%docker-image-max-layers)) + #:use-module (gnu build hurd-boot) #:use-module (gnu build image) #:use-module (gnu build install) #:autoload (gnu build file-systems) @@ -243,6 +244,9 @@ (define* (install os-drv target (delete-file-recursively state))) (chmod target #o755) + ;; For the Hurd to boot, it needs some essential device nodes. + (when (target-hurd?) + (make-hurd-device-nodes target)) (let ((os-dir (derivation->output-path os-drv)) (format (lift format %store-monad)) (populate (lift2 populate-root-file-system %store-monad)))