diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2013-12-31 12:14:36 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2013-12-31 15:25:34 -0800 |
| commit | 648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5 (patch) | |
| tree | 804668992861e77861968c76f30293c3d26a27f4 | |
| parent | doc/HOWTO.txt: Fix stage descriptions, and add extra context (diff) | |
| download | catalyst-648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5.tar.gz catalyst-648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5.tar.bz2 catalyst-648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5.zip | |
Backport a937ae8 /dev/shm mount fix to the 2.X branch.
Original patch:
Author: Anthony G. Basile <blueness@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.
| -rw-r--r-- | modules/generic_stage_target.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 848aca2f..9edafe99 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() |