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 D1468138247 for ; Fri, 3 Jan 2014 06:01:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05189E0A63; Fri, 3 Jan 2014 06:00:59 +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 88F49E09A4 for ; Fri, 3 Jan 2014 06:00:58 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 81FC633F563; Fri, 3 Jan 2014 06:00:57 +0000 (UTC) From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Cc: Brian Dolbec Subject: [gentoo-catalyst] [PATCH 1/2] modules/generic_stage_target.py, Create SOURCE_MOUNTS_DEFAULTS Date: Thu, 2 Jan 2014 22:00:43 -0800 Message-Id: <1388728844-2142-2-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1388728844-2142-1-git-send-email-dolsen@gentoo.org> References: <1388728844-2142-1-git-send-email-dolsen@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 55a43f23-5d2f-4894-beeb-4b1a46cd89c1 X-Archives-Hash: 4b76bcce9611cabdef4c2e683027607f Similarly to TARGET_MOUNTS_DEFAULTS this is a temporary location. This will simplify the migration to being fully configurable. It also simplifies initialization somewhat. --- modules/generic_stage_target.py | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 7919f07..790e4da 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -22,6 +22,15 @@ TARGET_MOUNTS_DEFAULTS = { "proc": "/proc", } +SOURCE_MOUNTS_DEFAULTS = { + "dev": "/dev", + "devpts": "/dev/pts", + "distdir": "/usr/portage/distfiles", + "portdir": "/usr/portage", + "port_tmpdir": "tmpfs", + "proc": "/proc", + } + class generic_stage_target(generic_target): """ @@ -194,23 +203,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 = { - "dev": "/dev", - "devpts": "/dev/pts", - "distdir": self.settings["distdir"], - "portdir": normpath("/".join([ - self.settings["snapshot_cache_path"], - self.settings["repo_name"], - ])), - "port_tmpdir": "tmpfs", - "proc": "/proc", - } - 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") -- 1.8.3.2