On Sat, 2013-12-14 at 14:24 -0800, W. Trevor King wrote: > From: Brian Dolbec <[email protected]> > > W. Trevor King: Refactored Git history for Brian Dolbec's content changes. > > Signed-off-by: W. Trevor King <[email protected]> > --- > catalyst | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/catalyst b/catalyst > index c62b745..cafc6e5 100755 > --- a/catalyst > +++ b/catalyst > @@ -67,6 +67,7 @@ def parse_config(myconfig): > "options": "", > "packagedir": "/usr/portage/packages", > "portdir": "/usr/portage", > + "port_tmpdir": "/var/tmp/portage", > "repo_name": "portage", > "sharedir": "/usr/share/catalyst", > "snapshot_name": "portage-",
Granted, my commits might have included too much for releng to handle
for review. Especially after I had merged commits into complete units
where possible (as had been requested). But, isn't this ridiculous. I
was even chastised before for adding something that wasn't used right
away. I consequently had to rebase it away.
This should be merged with commit 15 of this (once again) rebased series
at least. I've copy/pasted it here.
---
modules/generic_stage_target.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index e5bdf91..2426b12 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -179,9 +179,9 @@ class generic_stage_target(generic_target):
"/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\
"/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
else:
- self.mounts = ["proc", "dev", "distdir",
"/var/tmp/portage"]
+ self.mounts = ["proc", "dev", "distdir", "port_tmpdir"]
self.mountmap = {"proc":"/proc", "dev":"/dev",
"/dev/pts":"/dev/pts",\
-
"distdir":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
+ "distdir":self.settings["distdir"],
"port_tmpdir":"tmpfs"}
if os.uname()[0] == "Linux":
self.mounts.append("/dev/pts")
signature.asc
Description: This is a digitally signed message part
