From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id IJ9kNtAsmWMBwAAAbAwnHQ (envelope-from ) for ; Wed, 14 Dec 2022 02:54:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id AOxfNtAsmWNZ0gAAauVa8A (envelope-from ) for ; Wed, 14 Dec 2022 02:54:24 +0100 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 498E338D1B for ; Wed, 14 Dec 2022 02:54:24 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670982864; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=dJch6qNnQaj+pUEZB0gyIza8S0QxPB5GtjuDGuUa2q4=; b=I/apl9HMAZGC5xTz7w9En5cX55u7SeWRTkh4hOXGyK/jqZlQ1erClQr7BbMnHm/JEq5hNm XUGshCsUPH6/yTEfAMsISGtjeOv9rjHyLnkrKeHH8aKg/9fmrfclb84s9DTXZi1kxs9+Mf O9g6IyfozTObl2OHu81DNZIztYxrV/t6rrZaG9VVmx4uR0sPtnKkmtsPODkSe7snweEp8p /U1/ZmBADt/uKIGM6+/r12v2RljSRIoj0J4x1+trn1xn0F/5S8EDQDrJrbVxKgGwX3uiE6 4fDgTIWNXPLjwcqes9KciQWAzyWzINS0/0TNrySj7raTVWuVJXJ/VVnvmlXfHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=WGpgIDtW; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670982864; a=rsa-sha256; cv=none; b=BeDOH2CZId6hcK3b+/LJZqUZ0L8C8qR2Z6uuH8TTPEkl02sIHLpa23BQ0sq7ShXxeNyXOt WxFXwHU6Ud2b5w0GZOur5fCC8d6hrQcM8mgltoWT78SUTMNSZ2QgY3MFJ6xEFbG9zHZaX1 IoVwJxS9ttqiwgZfMM7wa2py2U4Ut7SQTAagDfU1yCMssMyqtI390gafPpIqbvUqbzwcw+ rccMNphivpVkKzkw8vnq+k/qiqOopp9Es4D2O0CAQZnnw1eiVTOKyBT+EtOFPecGBJ0h+h AYSknMYGtOalSCgNuoUetyn+5fe5jHPjde3e8YtqEy6TF3kIXgqG0Nb2APuG3w== X-Migadu-Spam-Score: 7.53 X-Spam-Score: 7.53 X-Migadu-Queue-Id: 498E338D1B X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=WGpgIDtW; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-TUID: DNwGis/c6xRD * 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(-) 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 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 -- 2.38.1