From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 831FD159C9B for ; Fri, 9 Aug 2024 19:34:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6670F2BC130; Fri, 9 Aug 2024 19:34:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4636D2BC130 for ; Fri, 9 Aug 2024 19:34:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D4813430FD for ; Fri, 9 Aug 2024 19:34:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 012051EE0 for ; Fri, 9 Aug 2024 19:34:08 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1722351228.c836c804b8b7ef88273751411b7b1a7f5b021680.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/stage1.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: c836c804b8b7ef88273751411b7b1a7f5b021680 X-VCS-Branch: dilfridge/qcow2 Date: Fri, 9 Aug 2024 19:34:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a6ad0c87-abce-4389-b434-2e3a61f5cdf7 X-Archives-Hash: e72ec004e28f582e238b9e8e03a76a5d Message-ID: <20240809193408.M_hTq82rmjwVgLf4uPrjGqpXyvF4M6QI5ASYpKGWhlI@z> commit: c836c804b8b7ef88273751411b7b1a7f5b021680 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Jul 30 14:53:48 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Jul 30 14:53:48 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c836c804 stage1: make sure we bind-mount within the chroot dir Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/targets/stage1.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index 1c9a4d42..cd10c86a 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -26,13 +26,17 @@ class stage1(StageBase): # In the stage1 build we need to make sure that the ebuild repositories are # accessible within $ROOT too... otherwise relative symlinks may point nowhere # and, e.g., portageq may malfunction due to missing profile. - # Create a second bind mount entry for each repository + # Create a second, bind mount entry for each repository. We need to + # * take as source not the original source but the original target, since + # otherwise we may end up trying to mount the same squashfs twice instead + # of a bind mount + # * take the directory inside the chroot as source, not the host directory for path, name, _ in self.repos: name = get_repo_name(path) mount_id = f'root_repo_{name}' self.mount[mount_id] = { 'enable': True, - 'source': self.get_repo_location(name), + 'source': self.settings['chroot_path'] / self.get_repo_location(name), 'target': normpath("/tmp/stage1root") / self.get_repo_location(name) }