[gentoo-commits] proj/catalyst:2.X commit in: modules/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 20:14:36 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 23:25:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=648c9cc9

Backport a937ae8 /dev/shm mount fix to the 2.X branch.

Original patch:
Author:    Anthony G. Basile <blueness <AT> gentoo.org> (Tue 31 Dec 2013 10:55:19 AM PST)
catalyst/targets/generic_stage_target.py: mount /dev/shm on linux

Some build systems require /dev/shm to be mounted, like python's
build system.  We make sure that on Linux systems, /dev/shm is
mounted in the stage chroots.  See bug #496328.

---
 modules/generic_stage_target.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 848aca2..9edafe9 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -174,16 +174,21 @@ class generic_stage_target(generic_target):
 
 		""" Setup our mount points """
 		if "SNAPCACHE" in self.settings:
-			self.mounts=["/proc","/dev","/usr/portage","/usr/portage/distfiles","/var/tmp/portage"]
+			self.mounts=["/proc", "/dev", "/usr/portage",
+				"/usr/portage/distfiles", "/var/tmp/portage"]
 			self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
 				"/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\
-				"/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
+				"/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
+				"/dev/shm": "/dev/shm"}
 		else:
-			self.mounts=["/proc","/dev","/usr/portage/distfiles","/var/tmp/portage"]
+			self.mounts=["/proc", "/dev", "/usr/portage/distfiles",
+				"/var/tmp/portage"]
 			self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
-				"/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
+				"/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
+				"/dev/shm": "/dev/shm"}
 		if os.uname()[0] == "Linux":
 			self.mounts.append("/dev/pts")
+			self.mounts.append("/dev/shm")
 
 		self.set_mounts()