From patchwork Wed Dec 14 01:53:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45251 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 2849627BBEB; Wed, 14 Dec 2022 01:54:27 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 6CA2927BBE9 for ; Wed, 14 Dec 2022 01:54:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5GyC-0001gm-3f; Tue, 13 Dec 2022 20:54:04 -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 1p5GyA-0001gN-QQ for guix-patches@gnu.org; Tue, 13 Dec 2022 20:54:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5GyA-0001nJ-I7 for guix-patches@gnu.org; Tue, 13 Dec 2022 20:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5GyA-0008Vr-DT for guix-patches@gnu.org; Tue, 13 Dec 2022 20:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60055] [PATCH] scripts: system: Skip initrd modules check when using --target. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Dec 2022 01:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60055 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60055@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167098279332686 (code B ref -1); Wed, 14 Dec 2022 01:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Dec 2022 01:53:13 +0000 Received: from localhost ([127.0.0.1]:35868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5GxN-0008V8-4s for submit@debbugs.gnu.org; Tue, 13 Dec 2022 20:53:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:37164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5GxL-0008V2-PR for submit@debbugs.gnu.org; Tue, 13 Dec 2022 20:53: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 1p5GxL-0001c3-H4 for guix-patches@gnu.org; Tue, 13 Dec 2022 20:53:11 -0500 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5GxJ-0000w7-Sw for guix-patches@gnu.org; Tue, 13 Dec 2022 20:53:11 -0500 Received: by mail-qt1-x835.google.com with SMTP id c7so1446280qtw.8 for ; Tue, 13 Dec 2022 17:53:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dJch6qNnQaj+pUEZB0gyIza8S0QxPB5GtjuDGuUa2q4=; b=WGpgIDtW1Mg4HWWbOTJ2d1qj0qY4Y/h1DWXTyDTNqcpkde6208yfZDC/LWVZIpF+pp mrdeyVZSyNX/dMoSzJT/GrECOyegQPITulvd1ZWPMinN3uoDTUK7A5zNhLRH+iSZGHLW YRMq5EWmjmJ68pkytMXaI/pddLCvYz1NCw4GNGIV9QM8o5g34Of52GhOF7hAiqW6emqm LQqX6ri02QwlQoeGj38wx3WNTQ4zZzNnY80yOZxDMqRoAkHwf5Z1dgUH7dv2rdariJbg DBBuIMxIukkYloQePcXNF+IjgYMEuWw4xYg4y15513YJNpMC0W2qUxcyzy6UGC0ZDhGe gsqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dJch6qNnQaj+pUEZB0gyIza8S0QxPB5GtjuDGuUa2q4=; b=maCxc3I4URhWt8D4DHrjMAfRKu70TriFNqyMNoSpDgiqYdurt30ya9iT4AJYzXTqEf CiUG//3mSAj3fAgAbC+zwbX4a/haMcTrLCSW2uDK/ssEjbn1CkD6xhe1b19aoPQoZEGl vAAzkz0N35RviHP/0rIB31YbEZ3CdgURw4je1/m1BQpaJ8sDkIfTPOqxtBAe9YsL+Ebf xRoajkqbBkiz28RwH5bOFwycdFrqQ8iugR4+n+fVYH7NbUOVenps1YIQWNkIGXBhUZOy QC1J8IoRwdBkA7u+cl2iTq6x/itWbBy3vwj98+sZMhqSupXLMs5c4F/4MS9L9AZIVmJi fMwQ== X-Gm-Message-State: ANoB5plntUoQ7eAzHqOH4tAlGcuCKoiEIqeMrbnkffk/J2ZYhHRBx74I ZCMXO2yjdBQxH78QOO6YE+AbxaxmcmSQGQ== X-Google-Smtp-Source: AA0mqf66r8+k1QXFPdGLXsHdMptuuZKsOKixcWdSJO+yD9SfFiTaHltAiYrL49ifqvlog0Kjuv99/A== X-Received: by 2002:ac8:51cf:0:b0:3a5:7a7c:25ba with SMTP id d15-20020ac851cf000000b003a57a7c25bamr8068791qtn.38.1670982788454; Tue, 13 Dec 2022 17:53:08 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id p20-20020ac84614000000b003a611cb2a95sm909096qtn.9.2022.12.13.17.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 17:53:07 -0800 (PST) From: Maxim Cournoyer Date: Tue, 13 Dec 2022 20:53:03 -0500 Message-Id: <20221214015303.18991-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::835; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x835.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * guix/scripts/system.scm (perform-action): Do not call CHECK-INITRD-MODULES when the %current-target-system parameter is set. --- guix/scripts/system.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) base-commit: 0ffa501f2b3e83ae56e9c2bd31418439090e869a prerequisite-patch-id: 660177fb9eee55d11983ea9360c072730d0d21a5 prerequisite-patch-id: 776778c03bce9b7ad3ab94a120f42b764c00fcae prerequisite-patch-id: 4910d08bdc27384d76030b6ac491ad2c2ed0957f prerequisite-patch-id: fd4074fb4cf068ccac3122c19138f098a610542a prerequisite-patch-id: b9b6f21a2db3f7a5ef82bb11ed23f69749cc6b3d prerequisite-patch-id: 51cecbabc04c69d4338addaece536c42a075660f prerequisite-patch-id: 2c67bfd85b343a65440e6c63451e5417129dea6f prerequisite-patch-id: b24087b240dad97b6417e37176915c24a543e887 prerequisite-patch-id: 2b8e69760af1f7bfb66c1edb44471653b6b229d1 prerequisite-patch-id: 2cb8792eedc8cfc23b4728f9ec44366aa394b954 prerequisite-patch-id: 8684fb6949ced334698dbf32ae71dd76c5eb2cfe diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 6482318168..54a79501ec 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -842,7 +842,10 @@ (define bootcfg (check-mapped-devices os) (when (zero? (getuid)) (check-file-system-availability (operating-system-file-systems os)) - (check-initrd-modules os))) + (unless (%current-target-system) + ;; Skip the check if the user is making use of --target, as it doesn't + ;; make sense in this context. + (check-initrd-modules os)))) (mlet* %store-monad ((sys (system-derivation-for-action image action