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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A5A1159C9B for ; Sat, 3 Aug 2024 09:06:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21EBBE2A76; Sat, 3 Aug 2024 09:06:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02BE7E2A76 for ; Sat, 3 Aug 2024 09:06:53 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B29A6335D64 for ; Sat, 3 Aug 2024 09:06:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24AB11E93 for ; Sat, 3 Aug 2024 09:06:51 +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: <1722675989.31d975c10785f4de73cd788285ccf2408aa54a30.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:master 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: 31d975c10785f4de73cd788285ccf2408aa54a30 X-VCS-Branch: master Date: Sat, 3 Aug 2024 09:06:51 +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: 743335d7-0812-47dd-bed9-90c8b206713c X-Archives-Hash: af631dd6d3814e7fd7ff753ec0bf72fb commit: 31d975c10785f4de73cd788285ccf2408aa54a30 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Aug 3 09:06:29 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Aug 3 09:06:29 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=31d975c1 stage1: make sure we bind-mount within the chroot dir, try 3, now with pathlib 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 ba42d9b8..ae27cd0a 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -31,14 +31,18 @@ class stage1(StageBase): # 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 + # In the meantime we fixed make.profile to point outside ROOT, so this may not + # be necessary at the moment anymore. Having it can prevent future surprises + # though. self.set_chroot_path() for path, name, _ in self.repos: name = get_repo_name(path) mount_id = f'root_repo_{name}' + repo_loc = self.get_repo_location(name) self.mount[mount_id] = { 'enable': True, - 'source': self.settings['chroot_path'] / self.get_repo_location(name), - 'target': normpath("/tmp/stage1root") / self.get_repo_location(name) + 'source': self.settings['chroot_path'] / repo_loc.relative_to('/'), + 'target': normpath("/tmp/stage1root") / repo_loc.relative_to('/') } def set_root_path(self): 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 5B88E159C9B for ; Fri, 9 Aug 2024 19:34:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B6FF2BC132; Fri, 9 Aug 2024 19:34:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 551142BC132 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 836133430F3 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 50AB61EE7 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: <1722675989.31d975c10785f4de73cd788285ccf2408aa54a30.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: 31d975c10785f4de73cd788285ccf2408aa54a30 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: 8c098e79-f198-48ac-9644-5d16e763a14d X-Archives-Hash: ae78327d9ec1a9f4991c92815c33734a Message-ID: <20240809193408.Mibtpmo_n0LjGo41-LW0xsH-EF3Sup7AR4DfUudsKPQ@z> commit: 31d975c10785f4de73cd788285ccf2408aa54a30 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Aug 3 09:06:29 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Aug 3 09:06:29 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=31d975c1 stage1: make sure we bind-mount within the chroot dir, try 3, now with pathlib 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 ba42d9b8..ae27cd0a 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -31,14 +31,18 @@ class stage1(StageBase): # 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 + # In the meantime we fixed make.profile to point outside ROOT, so this may not + # be necessary at the moment anymore. Having it can prevent future surprises + # though. self.set_chroot_path() for path, name, _ in self.repos: name = get_repo_name(path) mount_id = f'root_repo_{name}' + repo_loc = self.get_repo_location(name) self.mount[mount_id] = { 'enable': True, - 'source': self.settings['chroot_path'] / self.get_repo_location(name), - 'target': normpath("/tmp/stage1root") / self.get_repo_location(name) + 'source': self.settings['chroot_path'] / repo_loc.relative_to('/'), + 'target': normpath("/tmp/stage1root") / repo_loc.relative_to('/') } def set_root_path(self):