From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id DLf9Lma5t14MXAAA0tVLHw (envelope-from ) for ; Sun, 10 May 2020 08:20:54 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id UCOdDXS5t16YCQAA1q6Kng (envelope-from ) for ; Sun, 10 May 2020 08:21:08 +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 04A9994042C for ; Sun, 10 May 2020 08:21:06 +0000 (UTC) Received: from localhost ([::1]:45434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXhCr-0006Lg-P3 for larch@yhetil.org; Sun, 10 May 2020 04:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXhCo-0006LT-4w for guix-patches@gnu.org; Sun, 10 May 2020 04:21:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXhCn-00088C-SX for guix-patches@gnu.org; Sun, 10 May 2020 04:21:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jXhCn-0002X7-PU for guix-patches@gnu.org; Sun, 10 May 2020 04:21:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41011] [PATCH] gnu: grub: Support for network boot via tftp/nfs. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 May 2020 08:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41011 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Stefan Cc: 41011@debbugs.gnu.org Received: via spool by 41011-submit@debbugs.gnu.org id=B41011.15890988379685 (code B ref 41011); Sun, 10 May 2020 08:21:01 +0000 Received: (at 41011) by debbugs.gnu.org; 10 May 2020 08:20:37 +0000 Received: from localhost ([127.0.0.1]:48891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXhCP-0002W8-7t for submit@debbugs.gnu.org; Sun, 10 May 2020 04:20:37 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:43549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXhCO-0002Vw-3q for 41011@debbugs.gnu.org; Sun, 10 May 2020 04:20:36 -0400 Received: by mail-wr1-f54.google.com with SMTP id i15so6890568wrx.10 for <41011@debbugs.gnu.org>; Sun, 10 May 2020 01:20:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=VOIpucdgp2xG9wp8lO1HTfWkD4u7JevwrqpA8Q0i0k4=; b=PbKDwDYrFOX6ylCqQJMfKU5xwUdFENBXiXL9DgXBspPWxpokd5LWLwictsJeKIJjoe ImTwTX445UB3PxjGg3SUxhX9Iu/p6NzEmnW+rIzdxKBHJnY8onMAQjEW8ndBRnwoNe2Q JHwMyPW4gmNceGZtm8LyUFfDGcL1ZBwxxLydtSyhJdhafWEGRv0fdTqDGLdH6nLox6oO 35TrFFr6lfk5Ofc5RVUXtCNsHb9BnhaCqdD55gVuarH4vgvfGnLQDIzGdt5COegNtFRu 7qB2H8hpZ5KxX+57PoOkw79tUQlBK0KP386WPq2njnxLms0N+8xIrUBGUDwGgtdlpMLt nDFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=VOIpucdgp2xG9wp8lO1HTfWkD4u7JevwrqpA8Q0i0k4=; b=h/fMBghxe94TzgPtkcXDYo6EfhWByJXrzDg7EFMn56TiPqDpXoSVD2NSDx8KOMe0/X 3eb1ur3Mz5Mh/5T8yQPqyF8TUQmFn1xtzieEO2Gu/h83XjPeQZ6VWVKR+aT1Ll+iLhAW AN8LnHh6EJ/gg1T8EiO1MIMXKxbnAWwC/HMTN0G7S2TeCaNvtpJORmndIS39PFcAc2+E YPk5TyCpadSxaEswh7kdBOfvByPG4vrd+ZL2YTjyQ8p2DS6TOnjucNAyMjc6yRDpAfnD Hy9Ub/nm16vSHli4/1F26sL+Nzc0qelLbAPaqr1sc4ety8XM+NBL7UqiRFfhv0QvuOeD Z3kw== X-Gm-Message-State: AGi0PuYkHWb0DbbRqBTJ8ds2+e8LSQww6iI5VyW4pr2+dCHC3SMZN7nc TWwbvNGeO6nBgeqGaz1MiW/aussD X-Google-Smtp-Source: APiQypKKHMI9R/7TYv2cbsM7g3kPexQWCnsEO8M7K+WvqFjjOd/0R8SuApNmHW0wmH/m+I1a3D3q8A== X-Received: by 2002:a5d:4dc9:: with SMTP id f9mr2968505wru.407.1589098830245; Sun, 10 May 2020 01:20:30 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:708f:4d20:5fc9:ae90]) by smtp.gmail.com with ESMTPSA id n7sm2590810wro.94.2020.05.10.01.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 01:20:29 -0700 (PDT) From: Mathieu Othacehe References: <9AAFEFF4-8ACE-4C95-975F-67C3F4FDAF81@vodafonemail.de> Date: Sun, 10 May 2020 10:20:28 +0200 In-Reply-To: <9AAFEFF4-8ACE-4C95-975F-67C3F4FDAF81@vodafonemail.de> (Stefan's message of "Fri, 1 May 2020 22:32:44 +0200") Message-ID: <87a72gi4kz.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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" X-Scanner: scn0 X-Spam-Score: 0.09 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=PbKDwDYr; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [0.09 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.53894586828045]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.51.188.0/24:c]; R_DKIM_REJECT(1.00)[gmail.com:s=20161025]; DWL_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; FREEMAIL_FROM(0.00)[gmail.com]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.08), country: US(-0.00), ip: 209.51.188.17(-0.54)]; DKIM_TRACE(0.00)[gmail.com:-]; RCPT_COUNT_TWO(0.00)[2]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:209.51.188.0/24, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[larch=yhetil.org]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[mothacehe@gmail.com,guix-patches-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[41011@debbugs.gnu.org]; HAS_LIST_UNSUB(-0.01)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.51.188.17:from]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : SPF not aligned (relaxed),none] X-TUID: qHvPFXZTbTce Hello Stefan, This patch does not apply here. Could you rebase it on top of master? > - > - ;; Intel and EFI systems need to be switched into graphics mode, whereas > - ;; most other modern architectures have no other mode and therefore > - ;; don't need to be switched. > - > - ;; XXX: Do we really need to restrict to x86 systems? We could imitate > - ;; what the GRUB default configuration does and decide based on whether > - ;; a user provided 'gfxterm' in the terminal-outputs field of their > - ;; bootloader-configuration record. > - (if (string-match "^(x86_64|i[3-6]86)-" system) > - (format #f " > + (format #f " > set gfxmode=~a > insmod all_video > - insmod gfxterm~%" gfxmode) > - ""))) > + insmod gfxterm~%" > + (string-join > + (grub-gfxmode (bootloader-theme config)) > + ";"))) Why not enable graphic mode only if 'gfxterm' is provided in terminal-outputs fields, like suggested by the comment? > + (efi-bootloader-link (string-append "boot" > + (match arch > + ("i686" "ia32") > + ("x86_64" "x64") > + ("armhf" "arm") If cross-building for "arm-linux-gnueabihf", arch will be "arm" and won't match anything here. > + (catch 'system-error > + (lambda () (delete-file efi-bootloader-link)) > + (lambda _ #f)) You can use "false-if-exception" here I think. > + (symlink #$efi-bootloader > + efi-bootloader-link) > + (catch 'system-error > + (lambda () (delete-file store-link)) > + (lambda _ #f)) Same here. > +(define* (grub-efi-net-bootloader #:key (target #f) (efi-subdir #f)) #f if implicit if omitted. > + (let ((target (or target "boot")) > + (efi-subdir (or efi-subdir "efi/boot"))) It would be better to keep grub-efi-net-bootloader as a variable, like all other bootloaders. You could default configuration-file to "boot/efi/boot/grub.cfg" instead? Thanks, Mathieu