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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50A971382C5 for ; Fri, 5 Jun 2020 21:13:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73075E089A; Fri, 5 Jun 2020 21:13:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55FC5E089A for ; Fri, 5 Jun 2020 21:13:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9D4434EC7F for ; Fri, 5 Jun 2020 21:13:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C01E8287 for ; Fri, 5 Jun 2020 21:13:51 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1591391322.d2dd86b8f21337133d9d8c744c5f3fdd96867cd5.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: d2dd86b8f21337133d9d8c744c5f3fdd96867cd5 X-VCS-Branch: master Date: Fri, 5 Jun 2020 21:13: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: e157faca-4fe1-4d7f-b3ba-0dd72335c8af X-Archives-Hash: d50237df02d0386ba93a40452ccb6334 commit: d2dd86b8f21337133d9d8c744c5f3fdd96867cd5 Author: Daniel Cordero 0xdc io> AuthorDate: Thu May 21 17:32:47 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Jun 5 21:08:42 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d2dd86b8 embedded: copy root overlay into destpath When using a merge subpath (e.g. the embedded target's /tmp/mergeroot), root_overlay() copies the overlay into the seed stage, rather than the subpath. Copy the files into destpath. When not using a subpath, destpath equals chroot_path (so other stages are not affected). Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index ab1d409b..c2cc2c3e 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -838,7 +838,7 @@ class StageBase(TargetBase, ClearBase, GenBase): "/root_overlay"]: if os.path.exists(x): log.info('Copying root_overlay: %s', x) - cmd(['rsync', '-a', x + '/', self.settings['chroot_path']], + cmd(['rsync', '-a', x + '/', self.settings['destpath']], env=self.env) def bind(self):