From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 11 22:57:38 2020 Received: (at 44353) by debbugs.gnu.org; 12 Nov 2020 03:57:38 +0000 Received: from localhost ([127.0.0.1]:43360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kd3js-0005Ns-CF for submit@debbugs.gnu.org; Wed, 11 Nov 2020 22:57:38 -0500 Received: from mail-qk1-f193.google.com ([209.85.222.193]:40668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kd3jq-0005Nb-15 for 44353@debbugs.gnu.org; Wed, 11 Nov 2020 22:57:35 -0500 Received: by mail-qk1-f193.google.com with SMTP id y197so4137871qkb.7 for <44353@debbugs.gnu.org>; Wed, 11 Nov 2020 19:57:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c9BN8zswRGwbQ2JwxGzehLM0mTZbyqipFVh6R17/nJs=; b=rl+hZKXtIJjiS1FHBLJkzGUJpO7IjUPC22zQi5Bat2UdR/LDXt5NRb6nXo4UC85SnY jix60SZ5g53rbznbW3p9d9zwDEw7Hc/aENHYWLzTT5WXSLZmt/tykLgfIHJTkY2sBjGi zMEBLRyOs/AVsNe9hXEg4UHRiVEhDj2QKBF14o/L26SX7WtqCBuOVRlDwx6zQ8BlQxsL RLWSum52yAGKoel2sDzg2HQBkgoY9L6gIb3sm4kq6/2IE2K+A46zYNQFGUPBSqHk72VS ZtbNpg1LqD6aKLXZ2hFgtYKX08GQNZ9ZM0YjGpfsD973OJgbd0Yx51aSJZPvqsrfjrSW b1Lw== 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:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c9BN8zswRGwbQ2JwxGzehLM0mTZbyqipFVh6R17/nJs=; b=R1Nq2G7a0XE383qSDP7btVQ7HJDDIjr4QHU+gyEtFqf//BKOzSIIGdYcgNBsdPrTzc OilZPqqcOjuLoqUsHk3u7XnzF6lotaeR4/BtvWCQbhtRSyYc14Q1xNzQelqwUFHEZRBL Dmo7NlrZLPUTAkuScthKEl35g6np0lVid/2Q18Cd0sjIROm8apVm3EaStkloqlkCZ1xW 3Qiya+LMXxDH+HNy15CxxDlS0Ll/XbJAas+y82m4Swq0STo7OVBaYvVV/RT15Qqe+y75 jTwQQe7S3Paaa57wOCpavOnAQRmkKMbL0jocbDtupBZlN7dqn160vUia6fj6rCeSdeP3 aFMw== X-Gm-Message-State: AOAM533Qar4EExkh+c0YeCv+thW77uXmZ9Qh6TSHrfr/cZLB0gjJRt00 1i/ugT8nC1HJnTvKVtsxpMEck0AcnmU= X-Google-Smtp-Source: ABdhPJwL4X3Ur5ASgsASa6vkVQIZyxQIfKz/IxaxmxOU3qVeNQuKMMEAiICD1NyPnSPSz7I0bQHObw== X-Received: by 2002:a37:9b17:: with SMTP id d23mr29298217qke.254.1605153448192; Wed, 11 Nov 2020 19:57:28 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-153.b2b2c.ca. [72.10.133.153]) by smtp.gmail.com with ESMTPSA id m15sm4630009qtc.90.2020.11.11.19.57.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 19:57:27 -0800 (PST) From: Maxim Cournoyer To: 44353@debbugs.gnu.org Subject: [PATCH version-1.2.0 v2 1/3] image: Remove conflicting user-provided EFI file system. Date: Wed, 11 Nov 2020 22:57:11 -0500 Message-Id: <20201112035713.3789-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <87h7q0cdns.fsf@gnu.org> References: <87h7q0cdns.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 44353 Cc: Mathieu Othacehe , Jesse Gibbons , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) When the bootloader used is grub-efi-bootloader, an ESP partition and file system is already added by the image generator. If a conflicting user-provided EFI file system is provided, it will (likely) cause the boot to fail, as happens for the lightweight-desktop.tmpl and desktop.tmpl templates under gnu/system/examples. * gnu/system/image.scm (operating-system-for-image): Also remove file systems whose mount point is "/boot/efi". --- gnu/system/image.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 81152f0fc4..4972d9067b 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -576,7 +576,9 @@ it can be used for bootloading." (file-systems-to-keep (srfi-1:remove (lambda (fs) - (string=? (file-system-mount-point fs) "/")) + (let ((mount-point (file-system-mount-point fs))) + (or (string=? mount-point "/") + (string=? mount-point "/boot/efi")))) (operating-system-file-systems base-os))) (format (image-format image)) (os -- 2.28.0