From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5DE6C138247 for ; Tue, 31 Dec 2013 04:22:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2B6CE0B03; Tue, 31 Dec 2013 04:22:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61CF1E0AFC for ; Tue, 31 Dec 2013 04:22:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EFBB33F347 for ; Tue, 31 Dec 2013 04:22:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 57FC5E545E for ; Tue, 31 Dec 2013 04:22:13 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1388462374.1e7d906277a89e247c9c16b617ef2912dfb16e2b.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/generic_stage_target.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 1e7d906277a89e247c9c16b617ef2912dfb16e2b X-VCS-Branch: pending Date: Tue, 31 Dec 2013 04:22:13 +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-Archives-Salt: e6101a64-efdb-4959-a006-1fa9386b5ccb X-Archives-Hash: a29097b9e8ad523ac49db9872c8e8ae8 commit: 1e7d906277a89e247c9c16b617ef2912dfb16e2b Author: Brian Dolbec gentoo org> AuthorDate: Mon Dec 30 23:56:02 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Tue Dec 31 03:59:34 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1e7d9062 modules/generic_stage_target.py, Create SOURCE_MOUNTS_DEFAULTS Similarly to TARGET_MOUNTS_DEFAULTS this will simplify the migration to being fully configurable. It also simplifies initialization somewhat. --- catalyst/targets/generic_stage_target.py | 38 ++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py index d4cbc77..6634a08 100644 --- a/catalyst/targets/generic_stage_target.py +++ b/catalyst/targets/generic_stage_target.py @@ -22,6 +22,15 @@ TARGET_MOUNTS_DEFAULTS = { "proc": "/proc", } +SOURCE_MOUNTS_DEFAULTS = { + "proc": "/proc", + "dev": "/dev", + "devpts": "/dev/pts", + "distdir": "/usr/portage/distfiles", + "portdir": "/usr/portage", + "port_tmpdir": "tmpfs", + } + # for convienience pjoin = os.path.join @@ -198,22 +207,19 @@ class generic_stage_target(generic_target): """ Setup our mount points """ # initialize our target mounts. self.target_mounts = TARGET_MOUNTS_DEFAULTS.copy() - if "SNAPCACHE" in self.settings: - self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"] - self.mountmap = { - "proc": "/proc", - "dev": "/dev", - "devpts": "/dev/pts", - "portdir": normpath("/".join([ - self.settings["snapshot_cache_path"], - self.settings["repo_name"], - ])), - "distdir": self.settings["distdir"], - "port_tmpdir": "tmpfs"} - else: - self.mounts = ["proc", "dev", "distdir", "port_tmpdir"] - self.mountmap = {"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts", - "distdir":self.settings["distdir"], "port_tmpdir":"tmpfs"} + + self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"] + # initialize our source mounts + self.mountmap = SOURCE_MOUNTS_DEFAULTS.copy() + # update them from settings + self.mountmap["distdir"] = self.settings["distdir"] + self.mountmap["portdir"] = normpath("/".join([ + self.settings["snapshot_cache_path"], + self.settings["repo_name"], + ])) + if "SNAPCACHE" not in self.settings: + self.mounts.remove("portdir") + #self.mountmap["portdir"] = None if os.uname()[0] == "Linux": self.mounts.append("devpts")