From patchwork Fri Oct 25 09:39:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 69454 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 ECCC127BBEA; Fri, 25 Oct 2024 10:42:41 +0100 (BST) 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=ham 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 AD25427BBE2 for ; Fri, 25 Oct 2024 10:42:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4Gp4-0002QJ-U8; Fri, 25 Oct 2024 05:41:34 -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 1t4Gp1-0002OU-7Y for guix-patches@gnu.org; Fri, 25 Oct 2024 05:41:31 -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 1t4Gp0-0003sm-UZ for guix-patches@gnu.org; Fri, 25 Oct 2024 05:41:30 -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=uGH+OmIi8UD3voHjYhCdE4fssUNdW+3qzlCWpWSm0cY=; b=JPgwSh9sPRidLGY1r2xnbLWVSZWsEY6371yoZ7vnC+GAtIG22cz1KdV2/DuuoEqnnvRusLAn70GqODiJAgPTUC0KFTAEa0hFDci1h8bBYnoO+1GU1O+i4Az/II6sR5wVN7aOJl7iluvwCJWlQoqLfSW9Bndhw7c2FjRpv+OOhwI+uEfT6sCpuFPnzh8kdU/9//ko7OxhkJZBY5bh1yEeYenoqNHNnfB9rLWvulzd80/GwKTTq0nRRBuTHHEXWFx6AoB8J2PPfcvbemPKNMQj1PMi/GMLBQhSvm9ZPKCB1WElwbgL8oyGmTxRzwpnmeMUEBoc16Bvb35wacLmMb5XRQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4GpW-00025m-MJ for guix-patches@gnu.org; Fri, 25 Oct 2024 05:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73927] [PATCH v3 02/17] guix system: When installing the Hurd, create essential devices. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2024 09:42:02 +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 Received: via spool by 73927-submit@debbugs.gnu.org id=B73927.17298492737772 (code B ref 73927); Fri, 25 Oct 2024 09:42:02 +0000 Received: (at 73927) by debbugs.gnu.org; 25 Oct 2024 09:41:13 +0000 Received: from localhost ([127.0.0.1]:37293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Goi-00021B-N3 for submit@debbugs.gnu.org; Fri, 25 Oct 2024 05:41:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4God-000207-1Q for 73927@debbugs.gnu.org; Fri, 25 Oct 2024 05:41:08 -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 1t4Go1-0003lu-SS; Fri, 25 Oct 2024 05:40:29 -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=uGH+OmIi8UD3voHjYhCdE4fssUNdW+3qzlCWpWSm0cY=; b=MYX04lq1cqCvZL+krIbO vksBRxQYCvVF7nRE2by6ytS/Iw9zGyTjgTLnrfExc4NQ3mO/mz3mp8Y5j7dU4N1zmIr7x2ieBQf48 HrfBWS9kZFdmrVaWMX0yopUneVubvNi+q269apads8nVKxuyB00aATLe8RV59guKRZJ2GCUmcdjxe w3RQmtTwqpz2SFzFSbXNnwGIxGWTAOLjtKsYhVoS/RqujjGouNSWU7Y1ECH1Tdpgr9GUMfK52TWLS W/h0YjDI5sMT3ehnQycJgmKZrF4MI4y8Yt5KMwiiDS4SL6y6/8gZmOctwarYA0x2/b4EouC/D7jN5 8Gqfg7pJFgsqRA==; From: Janneke Nieuwenhuizen Date: Fri, 25 Oct 2024 11:39:54 +0200 Message-ID: <20241025094011.8540-3-janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241025094011.8540-1-janneke@gnu.org> References: <20241025094011.8540-1-janneke@gnu.org> 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 (maybe-copy to-copy) (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)))