From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8N8kMbtu2l78CAAA0tVLHw (envelope-from ) for ; Fri, 05 Jun 2020 16:11:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sNB/LLtu2l53OQAAB5/wlQ (envelope-from ) for ; Fri, 05 Jun 2020 16:11:39 +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 659D59404CF for ; Fri, 5 Jun 2020 16:11:39 +0000 (UTC) Received: from localhost ([::1]:42134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEwU-0005PL-CK for larch@yhetil.org; Fri, 05 Jun 2020 12:11:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhEty-0001wn-9v for bug-guix@gnu.org; Fri, 05 Jun 2020 12:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38115) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhEty-0007oF-0b for bug-guix@gnu.org; Fri, 05 Jun 2020 12:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhEtx-0001MI-PJ for bug-guix@gnu.org; Fri, 05 Jun 2020 12:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41541: merge wip-hurd-vm Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 05 Jun 2020 16:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41541 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Jan Nieuwenhuizen Received: via spool by 41541-submit@debbugs.gnu.org id=B41541.15913732975168 (code B ref 41541); Fri, 05 Jun 2020 16:09:01 +0000 Received: (at 41541) by debbugs.gnu.org; 5 Jun 2020 16:08:17 +0000 Received: from localhost ([127.0.0.1]:49661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhEtF-0001LI-C2 for submit@debbugs.gnu.org; Fri, 05 Jun 2020 12:08:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhEt7-0001Ky-WC for 41541@debbugs.gnu.org; Fri, 05 Jun 2020 12:08:15 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40080) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhEt2-0007hc-QE; Fri, 05 Jun 2020 12:08:04 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=50264 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jhEt1-00069Y-LL; Fri, 05 Jun 2020 12:08:04 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87o8qavktf.fsf@gnu.org> <87tv01vgqy.fsf@gnu.org> <87blm54hae.fsf@gnu.org> <874krtyhtg.fsf@gnu.org> <87h7vtzupa.fsf@gnu.org> <87r1uxwz5q.fsf@gnu.org> <87mu5ly7tx.fsf@gnu.org> <87mu5lsksn.fsf@gnu.org> <87y2p5vb7v.fsf@gnu.org> <87wo4oqzgu.fsf@gnu.org> <87k10otbr1.fsf@gnu.org> <87v9k85fdc.fsf@gnu.org> <874krrrj3c.fsf@gnu.org> <87mu5jfa75.fsf@gnu.org> <87mu5jhxp8.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 18 Prairial an 228 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 05 Jun 2020 18:08:00 +0200 In-Reply-To: <87mu5jhxp8.fsf@gnu.org> (Jan Nieuwenhuizen's message of "Thu, 04 Jun 2020 13:33:55 +0200") Message-ID: <878sh14hsv.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 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: , Cc: 41541@debbugs.gnu.org, Mathieu Othacehe 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: -1.01 X-TUID: IQ7Q0JpP06vs Hi, Jan Nieuwenhuizen skribis: > So, after digesting your message here I took the next step: grep for > _HURD_STARTUP and change it there, like so > > diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm > index 421783eb80..8c73ea8430 100644 > --- a/gnu/packages/hurd.scm > +++ b/gnu/packages/hurd.scm > @@ -428,9 +428,10 @@ exec ${system}/rc \"$@\" > "startup/startup.c") > (("/hurd/") > (string-append out "/hurd/"))) > - (substitute* "hurd/paths.h" > - (("_HURD_STARTUP\t") > - (string-append "_HURD_STARTUP\t\"" out "\" "))) > + (substitute* '("libdiskfs/boot-start.c" > + "libdiskfs/opts-std-startup.c") > + (("_HURD_STARTUP") > + (string-append "\"" out "/hurd/startup\""))) Perfect! Perhaps we can add a comment explaining that this is needed for the first boot, when the /hurd symlink doesn=E2=80=99t exist yet. > This also works, and so I figure we're fine now. I'm resetting > wip-hurd-vm and, like Mathieu suggested will prepare to send send a > patch series here for the unreviewed subset of patches. Thank you! Ludo=E2=80=99.