From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kLwACA9EIme+XAEAqHPOHw:P1 (envelope-from ) for ; Wed, 30 Oct 2024 14:34:55 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id kLwACA9EIme+XAEAqHPOHw (envelope-from ) for ; Wed, 30 Oct 2024 15:34:55 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=kqlqvMmB; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="Xzdd/vOe"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730298895; a=rsa-sha256; cv=none; b=GtXDFrmAJ4nSzfHO9cqkmWTLYekuo9E5ZXxTVNuP5TK0e7TE1ChsYPqh6H9Wem7MrCtnta gX2LWf2sjfxomBhffIxgs2KR21lkevaH3jLGgfiohu0U0XgZRWMJgzZVwgdb00SDfyuaaU Dz05lnxlZJ41I36Ol9+yWFxEZ0ywzp2MJmRzcrnFPvZq15ESihV20Evj/zdCvrO6JPenmX jx/uLmWA4LmxS4lxdYFQmCNdYpUb6ThY8qsqMT3HmbBM8Am4GGryrpINXISUFCPTiGRCcf Z6CpGebdePmCuuQD3DDPD2n9cslDhjqbx23FIBN4JAbTjW5q/agT+fSkPSyEjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=kqlqvMmB; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="Xzdd/vOe"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730298895; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=skddpd7CrqziZHRHibNOoVO8k85rWwhGOskhqDeKxjo=; b=mtM+C/lXv4XBN18N1pndvYZ5Mq9SXosfwqWzJxEc0yEQ5DWT1mJOrcfkJlK62g5J9wFCPh vJlyzwknbU35av4OlL1EMP6lVErdPH0kdCZZUk5wL8FEtgq0FgDTHXDXym0G5HXdfv/fOO 57ODgdo5k8wBBkW1gRp4zWFkyleZnFYm5C1+OKxDWiM92wTz32HGbkYOhcO1HuA/GbOCPF ycV/qkQMtx3eizPeiGPJ3+fioLY7SoCicccpH3eX8w7XCk9cI8iuW79fjZ0DJoJ0LSb0Zb wT5nO6Y6D0D05FSAuiHZ23uuig4OyhDDM0fo6OjX5OkUCpMD1SsQWwDFDz5ePw== 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 E943077D1F for ; Wed, 30 Oct 2024 15:34:54 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t69lz-0002EK-7q; 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 1t69lu-0002CR-Cf for guix-patches@gnu.org; Wed, 30 Oct 2024 10:34:06 -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 1t69lu-0003dF-48 for guix-patches@gnu.org; Wed, 30 Oct 2024 10:34:06 -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=skddpd7CrqziZHRHibNOoVO8k85rWwhGOskhqDeKxjo=; b=kqlqvMmBvRQLvpsmzenIuIXd8tyix2OdAGePKLVyA92D3WuMabqKeQzfycD1OtFx6pWwwkczhHfneQYuFShv0YzoO8Cif3/8uHyxPJO3mZAYdJjX6qlt7d47boeW9TQufCyIsIidpGDqFl4gZrbLZWIp4Mt/jQP1CJc0Sl8trFpcyVd1zXKp/Cmhekd4lvJxWG7LwrbJsqnO7bcTiVrrS7QhxOlkL+q8ihB6Wf07pO42FM1OPlzIRQwXQ2oPyVazsZ6diFeBXF7V4xi4LuZm78agueDwI9Teds9dRNEnciS1ZsWm4Gu1eO36txN6wC7Wd2bodRvNDYcINkS2T6jR5A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t69lt-0003yh-TG for guix-patches@gnu.org; Wed, 30 Oct 2024 10:34:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73927] [PATCH v4 07/18] gnu: hurd: Support second boot. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Oct 2024 14:34:05 +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.173029883215155 (code B ref 73927); Wed, 30 Oct 2024 14:34:05 +0000 Received: (at 73927) by debbugs.gnu.org; 30 Oct 2024 14:33:52 +0000 Received: from localhost ([127.0.0.1]:35330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69lf-0003wG-HO for submit@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69lH-0003uL-E3 for 73927@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:28 -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 1t69j5-0003LP-48; Wed, 30 Oct 2024 10:31:11 -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=skddpd7CrqziZHRHibNOoVO8k85rWwhGOskhqDeKxjo=; b=Xzdd/vOevZ9Yulens3Aa IIWZE8UzkO+HfHK+7x0/EuXuO0Y/AHsKnupS01g7I6ZsvYvsWF/l7ar8aNsaejHGLd9882FptZbLy tLSrdL6JOroUrYNiG/M9mJeILeZrS/XekaYTcxmhFWD97UroqXL7mgmFmSA9RJTh23OG7DM1ShEEc 1pPOa3XOjS3VNd0ZrDj38j6WP//MeKxWMf1mfHrot5B+E5RiXOIt+zapfy7/1XAxj+oY+yQ6E+fPg fnsW9szLfuoR5ifFaQUyplbxXMBzECXnzQhZABDPU/uNns0QP6Kr40tfnzsHTJNTOEDMNojUMwpyc cV57ZvAj6kPWqA==; From: Janneke Nieuwenhuizen Date: Wed, 30 Oct 2024 15:30:36 +0100 Message-ID: <02512a12da4e00eb89b5e919c3fa6665608d941c.1730296564.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.66 X-Spam-Score: -2.66 X-Migadu-Queue-Id: E943077D1F X-Migadu-Scanner: mx10.migadu.com X-TUID: mVEF00PuwV8j This avoids hanging upon second boot and ensures a declarative /hurd and /dev. * gnu/packages/patches/hurd-startup.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/hurd.scm (hurd): Use it. [arguments]: In stage create-runsystem remove /dev/urandom. Change-Id: Ifcca5562c297204735c35132820a32ca0f273677 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 6 +- gnu/packages/patches/hurd-startup.patch | 82 +++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/hurd-startup.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1040b3927b..872e55eb41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1542,6 +1542,7 @@ dist_patch_DATA = \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ %D%/packages/patches/hurd-rumpdisk-no-hd.patch \ + %D%/packages/patches/hurd-startup.patch \ %D%/packages/patches/hwloc-1-test-btrfs.patch \ %D%/packages/patches/i7z-gcc-10.patch \ %D%/packages/patches/icecat-makeicecat.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index e6ea920714..9c1681f236 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -317,7 +317,8 @@ (define-public hurd (name "hurd") (source (origin (inherit (package-source hurd-headers)) - (patches (search-patches "hurd-rumpdisk-no-hd.patch")))) + (patches (search-patches "hurd-rumpdisk-no-hd.patch" + "hurd-startup.patch")))) (version (package-version hurd-headers)) (arguments `(#:tests? #f ;no "check" target @@ -388,6 +389,9 @@ (define-public hurd # Note: this /hurd/ gets substituted settrans --create /servers/socket/1 /hurd/pflocal +# Upon second boot, (file-exists? /dev/null) in hurd-boot-system hangs unless: +rm -f /dev/urandom + # parse multiboot arguments for i in \"$@\"; do case $i in diff --git a/gnu/packages/patches/hurd-startup.patch b/gnu/packages/patches/hurd-startup.patch new file mode 100644 index 0000000000..0b0dcc9537 --- /dev/null +++ b/gnu/packages/patches/hurd-startup.patch @@ -0,0 +1,82 @@ +This avoids hanging upon second boot and ensures a declarative /dev. + +Upstream status: Not presented upstream. + +From a15d281ea012ee360c45376e964d35f6292ac549 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Sat, 27 May 2023 17:28:22 +0200 +Subject: [PATCH] startup: Remove /hurd, /dev, create /servers. + +This avoids hanging upon second boot and ensures a declarative /hurd +and /dev. + +* startup/startup.c (rm_r, create_servers): New functions. +(main): Use them to remove /dev and create /servers. Remove /hurd +symlink. +--- + startup/startup.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +diff --git a/startup/startup.c b/startup/startup.c +index feb7d265..5f380194 100644 +--- a/startup/startup.c ++++ b/startup/startup.c +@@ -732,6 +732,42 @@ parse_opt (int key, char *arg, struct argp_state *state) + return 0; + } + ++#include ++static int ++rm_r (char const *file_name) ++{ ++ int callback (char const *file_name, struct stat64 const *stat_buffer, ++ int type_flag, struct FTW *ftw_buffer) ++ { ++ fprintf (stderr, "startup: removing: %s\n", file_name); ++ return remove (file_name); ++ } ++ ++ return nftw64 (file_name, callback, 0, FTW_DEPTH | FTW_MOUNT | FTW_PHYS); ++} ++ ++void ++create_servers (void) ++{ ++ char const *servers[] = { ++ "/servers/startup", ++ "/servers/exec", ++ "/servers/proc", ++ "/servers/password", ++ "/servers/default-pager", ++ "/servers/crash-dump-core", ++ "/servers/kill", ++ "/servers/suspend", ++ 0, ++ }; ++ mkdir ("/servers", 0755); ++ for (char const **p = servers; *p; p++) ++ open (*p, O_WRONLY | O_APPEND | O_CREAT, 0444); ++ mkdir ("/servers/socket", 0755); ++ mkdir ("/servers/bus", 0755); ++ mkdir ("/servers/bus/pci", 0755); ++} ++ + int + main (int argc, char **argv, char **envp) + { +@@ -741,6 +777,12 @@ main (int argc, char **argv, char **envp) + mach_port_t consdev; + struct argp argp = { options, parse_opt, 0, doc }; + ++ /* GNU Guix creates fresh ones in boot-hurd-system. */ ++ unlink ("/hurd"); ++ rm_r ("/dev"); ++ mkdir ("/dev", 0755); ++ create_servers (); ++ + /* Parse the arguments. We don't want the vector reordered, we + should pass on to our child the exact arguments we got and just + ignore any arguments that aren't flags for us. ARGP_NO_ERRS +-- +2.40.1 + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com