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 IDEjNovfe2fbWAAAqHPOHw:P1 (envelope-from ) for ; Mon, 06 Jan 2025 13:50:04 +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 IDEjNovfe2fbWAAAqHPOHw (envelope-from ) for ; Mon, 06 Jan 2025 14:50:03 +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=o6WY3DqJ; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=KX1l5P0m; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1736171403; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=96Shrag1sZeLh4FLtsUKMKIT1KpvwigDVDM+og1ADXE=; b=TgTfg+MJXgqthvAeZy/YImOGjdVlnFjJeVCD3WjXuaqVHUR4a8yMYA2EniD/mZPTKNjCKA UbDi8N9i4FrNwIkzI+NVN4XA7RYzSGLF+OOo9ROuVeI9f7NDkKgUbCxQIJODGnGEo5fWVE DfuZC7AaNyOrRtbT7a+ti9j7DEAvVjq+xTkqSPygvn749OdjZtjeinvMY5r33eFVRe4YMU cZvEi+Kt1pLRXVm+49M2X1gxBgHHw7SI62gbYE7Q3yTqreglCY+NtsJVCn1o8PlMV8gMJJ Nu8xH4vLzN19ssm3tJdSoFElyX2Gei34N2W1LHMQOOAM6+mjL+LTV0zhGBVPYQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=o6WY3DqJ; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=KX1l5P0m; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1736171403; a=rsa-sha256; cv=none; b=mc898VkTBXSE4hmt+us213MBVYB02OhQ3A4X62lgmaeXUTv/hQ93wmVEIyRTJX318hZUMk zsMNCS7ZGIPUXhhGYqncBc/r55ReL9Nqz365zJbjhLXRSCTfvwJP0mKRyPTV31bivOktB3 2fJ2jSqzipeN7oSaji84cEhUEXDp+q8bqhdHbIHckWyuqUFtVeUhUQDSqKK/ZwYr/88zkT 2Vxek0BHy1HMi2K9mK0S0KHPAh/cW+g0fYSBCq9bv8M5QP0ppjLoK0ttjzuRNPhR6l/1CQ vf5CfQSSdx5CHp2uq7RqsySVw2wdeKuabG7mWPpMnzBihQPpSE3vfMt2vHwkuw== 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 AC782863D1 for ; Mon, 06 Jan 2025 14:50:03 +0100 (CET) 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 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: -3.99 X-Spam-Score: -3.99 X-Migadu-Queue-Id: AC782863D1 X-Migadu-Scanner: mx10.migadu.com X-TUID: kSDOgiOAnnOH 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, -- 2.47.1