From patchwork Mon Jan 6 12:58:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 36680 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 29CA627BBE9; Mon, 6 Jan 2025 13:00:34 +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 A4BF227BBE2 for ; Mon, 6 Jan 2025 13:00:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUmiM-00045i-2D; Mon, 06 Jan 2025 08:00:15 -0500 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 1tUmiH-00043g-Qi for guix-patches@gnu.org; Mon, 06 Jan 2025 08:00:09 -0500 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 1tUmiE-0001u6-6D; Mon, 06 Jan 2025 08:00:09 -0500 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=96Shrag1sZeLh4FLtsUKMKIT1KpvwigDVDM+og1ADXE=; b=o6WY3DqJnOjC/Un4NcW7hQ/lf49xb/Ktcz5uZ55nIaWnMpM53tuq/70XWjeRAOIfjrzwL2zUBamSlD2432+XI7879eflMIU8GKxtsvpsHw2bY2hpPKv9DWZmsz5AOVp5ItH8hPVVTpizn90+Hq+T6TWF01MjM0vRcevadRMr7CdK1kKF9OB+AkIB0NUTQ5uSDQisWFiJZ2jIY1FsbBFham70P2zmaoAPuZvewTDhgRY5PyWGJlVBdxkLhG/4XZVLQrbvEWvCc9wNlnuFrxW4AcML1pFAgkTyn3CGavFN9/oaCGswC/AX2yp6p01A6aUMtdC2iRhU1k35EKcAedqvVw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUmiB-0002Vr-E2; Mon, 06 Jan 2025 08:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75402] [PATCH 1/3] reconfigure: Do not pass KEXEC_FILE_DEBUG. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= 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: Mon, 06 Jan 2025 13:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75402 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75402@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , nathan , Simen =?utf-8?q?Endsj=C3=B8?= , 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 75402-submit@debbugs.gnu.org id=B75402.17361683439473 (code B ref 75402); Mon, 06 Jan 2025 13:00:03 +0000 Received: (at 75402) by debbugs.gnu.org; 6 Jan 2025 12:59:03 +0000 Received: from localhost ([127.0.0.1]:37164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUmhC-0002SX-BV for submit@debbugs.gnu.org; Mon, 06 Jan 2025 07:59:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55170) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUmh9-0002S9-5e for 75402@debbugs.gnu.org; Mon, 06 Jan 2025 07:59:00 -0500 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 1tUmh2-0001cw-VR; Mon, 06 Jan 2025 07:58:53 -0500 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=96Shrag1sZeLh4FLtsUKMKIT1KpvwigDVDM+og1ADXE=; b=KX1l5P0mr/wFI7ZSlvxz S5+ht/ghYHBFTZ2rDsacfvfza6kt3CqviO2Dthf4y1wEIs5Q/cGD0ks1d7FAOSVMzWMiYzqh+NbaM 9FfTpYobUWcjVMPeyJodJB7QI7K9anIAnEaByRRtLaNfYQTUcJK6/OvVA6Dtkf/umOnOEFAl8Ot8S +lyk6G1gzHDOhxrzqf2heQ9ZKPxaquKppt1JrHo1WH3qZ4CM2xjS1iE6x367G9G1jgvSLuq+BWEiH 8ebXMZLvBPeXzYGn63u/uW2HtVsvlOCkVMnxcbWbHthkIpfYkyA8G7KBmbE3KoXOJxFVhHMxkNodb xgexnRr64bRsiw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 6 Jan 2025 13:58:35 +0100 Message-ID: <5c693e7d8bec42c1430bf9de00b8b408f38c6d39.1736168030.git.ludo@gnu.org> X-Mailer: git-send-email 2.47.1 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 This flag is unsupported in Linux 6.6 and causes ‘kexec_file_load’ to fail with EINVAL. Fixes . * guix/scripts/system/reconfigure.scm (kexec-loading-program): Remove KEXEC_FILE_DEBUG. * guix/build/syscalls.scm (KEXEC_FILE_DEBUG): Add comment. Suggested-by: nathan Reported-by: Simen Endsjø Change-Id: Ia48be7f4cfa9c6352908e4bea6472cd648f866ed --- guix/build/syscalls.scm | 4 ++-- guix/scripts/system/reconfigure.scm | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 960339e8bf..0f8927844b 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2024 Ludovic Courtès +;;; Copyright © 2014-2025 Ludovic Courtès ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Mathieu Othacehe @@ -783,7 +783,7 @@ (define (string->utf-8/nul-terminated str) (define KEXEC_FILE_UNLOAD #x00000001) (define KEXEC_FILE_ON_CRASH #x00000002) (define KEXEC_FILE_NO_INITRAMFS #x00000004) -(define KEXEC_FILE_DEBUG #x00000008) +(define KEXEC_FILE_DEBUG #x00000008) ;missing from Linux 6.6 (define kexec-load-file (let* ((proc (syscall->procedure int "syscall" diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index e9e16e3422..96e5bff351 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2022, 2024 Ludovic Courtès +;;; Copyright © 2014-2022, 2024-2025 Ludovic Courtès ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017, 2018 Chris Marusich ;;; Copyright © 2017 Mathieu Othacehe @@ -198,8 +198,7 @@ (define (kexec-loading-program os) (kexec-load-file kernel initrd (string-join (list #$@(operating-system-kernel-arguments - os root-device))) - KEXEC_FILE_DEBUG))))))) + os root-device)))))))))) (define* (upgrade-shepherd-services eval os) "Using EVAL, a monadic procedure taking a single G-Expression as an argument, From patchwork Mon Jan 6 12:58:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 36681 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 482A427BBE9; Mon, 6 Jan 2025 13:00:44 +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 BFEB827BBE2 for ; Mon, 6 Jan 2025 13:00:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUmiK-00045Q-SH; Mon, 06 Jan 2025 08:00:12 -0500 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 1tUmiH-00043Y-Qi for guix-patches@gnu.org; Mon, 06 Jan 2025 08:00:09 -0500 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 1tUmiC-0001rF-8m for guix-patches@gnu.org; Mon, 06 Jan 2025 08:00:07 -0500 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=McSLnnb/ZR6MiR5MUGIfVjrDgle3UGjmMP0bdeGOTJQ=; b=kH/Kmj2OzHq5yx6K5vRqCxX6GQGfiAsVUD5fc/ju/7IZiWTm7hARxWIZ66qof95swC0o6oHnLu/T0bTo2l+J+VzL1mWARcIBskatsoysH8fx00sKRWJNkkfQuvfYl2ZpzI3duKeixj1hLDS6FFjROW6u0EcFxloDvxkBznNkZxAQ429AnG39wTH3MYwZ/wGHkD6QoF7hvloVmEUrvhd+2FHELok25Qigj8tdj8bg6dk5BabqlszJ0pQMJNcuIdzLD8vZn/dnP2zhxs85X/nkgZpJxtjX2A/d8m5/FMJnhF/psJVWQ5EpeBwi2Y1s134ZrTmHvfRRj+sOkwQsPlM26A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUmiC-0002WX-2G for guix-patches@gnu.org; Mon, 06 Jan 2025 08:00:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75402] [PATCH 2/3] syscalls: Remove wrong syscall ID for =?utf-8?b?4oCYa2V4ZWNfbG9hZF9maWxl4oCZ?= on i686. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jan 2025 13:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75402 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75402@debbugs.gnu.org Cc: Dariqq , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 75402-submit@debbugs.gnu.org id=B75402.17361683459488 (code B ref 75402); Mon, 06 Jan 2025 13:00:04 +0000 Received: (at 75402) by debbugs.gnu.org; 6 Jan 2025 12:59:05 +0000 Received: from localhost ([127.0.0.1]:37166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUmhF-0002Sx-1a for submit@debbugs.gnu.org; Mon, 06 Jan 2025 07:59:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55186) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUmh9-0002SC-Ub for 75402@debbugs.gnu.org; Mon, 06 Jan 2025 07:59:03 -0500 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 1tUmh4-0001d7-Jh; Mon, 06 Jan 2025 07:58:54 -0500 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=McSLnnb/ZR6MiR5MUGIfVjrDgle3UGjmMP0bdeGOTJQ=; b=ccn+2OFNp5GJI5lbI+29 FRIufsJ8X05hn4sQopN7N/otzozAbR+/sQ+SS1Y6fn0e2FHgyxyS+6Uv4jPuwaMGETZBPI+OeA6gI OGSHiTsbiARtRS3Z2TDUsVU3xawDUB7OK9r/cIqmlrSHRD/0fCj9B81CP/03M/m/MKRYKLBIsiCJc d9brErJHr7LqbX+EzCLjZCPYk6ovAz6dwdYIkKnYvpi4pVYb2LccSkp5a/FbTqe/JRJlqr71xZkjA aDIg40MxA5jxs5Bl88R5h9hFBh7kluJ4s68ZKVxy9it2xYm+CngiaTCXywlkUOYm+F96B3h0yIGeE acwtrh7l07ptIg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 6 Jan 2025 13:58:36 +0100 Message-ID: <6062eaed018a8c738577dbb699d7e0324a4f8746.1736168031.git.ludo@gnu.org> X-Mailer: git-send-email 2.47.1 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 Fixes . * guix/build/syscalls.scm (kexec-load-file): Remove syscall ID for i686. * tests/syscalls.scm ("kexec-load-file"): Accept ENOSYS in addition to EPERM. Reported-by: Dariqq Change-Id: I83fe25636addb57533ed88cbfb40107d265b13a7 --- guix/build/syscalls.scm | 2 +- tests/syscalls.scm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 0f8927844b..7e16452462 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -794,8 +794,8 @@ (define kexec-load-file '* ;cmdline unsigned-long))) ;flags (syscall-id (match (utsname:machine (uname)) - ("i686" 320) ("x86_64" 320) + ;; unsupported on i686 ("armv7l" 401) ("aarch64" 294) ("ppc64le" 382) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index eef864d097..d2848879d7 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2021, 2024 Ludovic Courtès +;;; Copyright © 2014-2021, 2024-2025 Ludovic Courtès ;;; Copyright © 2015 David Thompson ;;; Copyright © 2020 Simon South ;;; Copyright © 2020 Mathieu Othacehe @@ -682,15 +682,15 @@ (define perform-container-tests? (when (or (zero? (getuid)) (not (string-contains %host-type "linux"))) (test-skip 1)) -(test-equal "kexec-load-file" - EPERM +(test-assert "kexec-load-file" (catch 'system-error (lambda () (let ((fd1 (open-fdes "/dev/null" O_RDONLY)) (fd2 (open-fdes "/dev/null" O_RDONLY))) (kexec-load-file fd1 fd2 "gnu.repl=yes"))) (lambda args - (system-error-errno args)))) + (member (system-error-errno args) + (list EPERM ENOSYS))))) (test-end) From patchwork Mon Jan 6 12:58:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 36679 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 A686727BBEA; Mon, 6 Jan 2025 13:00:19 +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 534BD27BBE2 for ; Mon, 6 Jan 2025 13:00:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUmiM-00045h-2R; Mon, 06 Jan 2025 08:00:15 -0500 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 1tUmiH-00043j-T5 for guix-patches@gnu.org; Mon, 06 Jan 2025 08:00:09 -0500 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 1tUmiG-0001uN-6x; Mon, 06 Jan 2025 08:00:09 -0500 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=T9xxGeO4xRkvWjUVaQbFT2D8Ty5il3JsrW87kTrL6xM=; b=p0khYsZjhCH7dZj8/0sLXvqtEoWHB/8P6qVcAXftJpZFSvQuQOc4NLDBF3AzDRooKBYt9MTgtOVnfebT/mDuHMcEmK5deVAirWfGlopDK3/OYP1Se2QI9zb9QJs56mcTNULkb7iYKXrR9+EYBwFzuJWQpVwkNrra1tY3u/4fVF//rrNipcjiZUVVp3ZBspozFGrAbJ75TQ1262F/7e3FjMvnQArhia6EGfEFEpWETbtZEoTLwi+Cmq6kH/KMHuQ9QNoY0arMEEnOCreER0WUJWpVsjCERNCA53xA+zZLnZdEv+iRtDqoTdLS3WcsagmJbPxTZAJQ+vFGys2ylKftcQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUmiC-0002Wz-Pv; Mon, 06 Jan 2025 08:00:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75402] [PATCH 3/3] reconfigure: Make =?utf-8?b?4oCYbG9hZC1z?= =?utf-8?b?eXN0ZW0tZm9yLWtleGVj4oCZ?= errors non-fatal. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= 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: Mon, 06 Jan 2025 13:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75402 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75402@debbugs.gnu.org Cc: Luis Guilherme Coelho , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , 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 75402-submit@debbugs.gnu.org id=B75402.17361683509513 (code B ref 75402); Mon, 06 Jan 2025 13:00:04 +0000 Received: (at 75402) by debbugs.gnu.org; 6 Jan 2025 12:59:10 +0000 Received: from localhost ([127.0.0.1]:37170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUmhJ-0002TJ-EW for submit@debbugs.gnu.org; Mon, 06 Jan 2025 07:59:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50800) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUmhH-0002SY-E9 for 75402@debbugs.gnu.org; Mon, 06 Jan 2025 07:59:07 -0500 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 1tUmhC-0001dj-5p; Mon, 06 Jan 2025 07:59:02 -0500 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=T9xxGeO4xRkvWjUVaQbFT2D8Ty5il3JsrW87kTrL6xM=; b=jQCmKIEeSG7y9Txz1dE6 4Cr3OcdzuDEwOlRT73Xz/zhgj/PBfv8bFIGl9U5RICqDHTqoxvBJ8PNn88TDjmVolLoJFuMZiuwmo qx8JnsqHqt4DUnT8yXRuwDTj8qOOlpftulkzglLax8O0b5IAttS1tObRhM4vc3KBC7byyShl6tuYa m6OAEzzXmwNHWEXa3TG8XIyAwVzoytQPgwnqWtSms0Z1uUg7Cd5cZtJRHraUukfH7lRDUXkGbVq/4 f8kluzvLLZNxuWajRR6/RFDAPicHL79NatnQKJIhKAJFcBKsMGwIPwxl77/zqYJlq8o0uP7CzuWO8 9kzK+s6ehIQJjg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 6 Jan 2025 13:58:37 +0100 Message-ID: <7b6998df5bf49154493079c304e2362eb102b57c.1736168031.git.ludo@gnu.org> X-Mailer: git-send-email 2.47.1 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 Partially fixes . * guix/scripts/system/reconfigure.scm (load-system-for-kexec): Catch exceptions in the gexp. Report them outside. Reported-by: Luis Guilherme Coelho Change-Id: Iebcdc92e29b8623a55967d58a4f353abab01631a --- guix/scripts/system/reconfigure.scm | 33 +++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 96e5bff351..d35980590d 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -230,10 +230,35 @@ (define* (upgrade-shepherd-services eval os) to-restart))))))) (define (load-system-for-kexec eval os) - "Load OS so that it can be rebooted into via kexec, if supported. Return -true on success." - (eval #~(and (string-contains %host-type "-linux") - (primitive-load #$(kexec-loading-program os))))) + "Load OS so that it can be rebooted into via kexec, if supported. Print a +warning in case of failure." + (mlet %store-monad + ((result (eval + #~(and (string-contains %host-type "-linux") + (with-exception-handler + (lambda (c) + (define kind-and-args? + (exception-predicate &exception-with-kind-and-args)) + + (list 'exception + (if (kind-and-args? c) + (call-with-output-string + (lambda (port) + (print-exception port #f + (exception-kind c) + (exception-args c)))) + (object->string c)))) + (lambda () + (primitive-load #$(kexec-loading-program os)) + 'success) + #:unwind? #t))))) + (match result + ('success + (return #t)) + (('exception message) + (warning (G_ "failed to load operating system for kexec: ~a~%") + message) + (return #f))))) ;;;