| 1 |
commit: a6e39695fec360dce3612e8b3f00ff0cc9fec4d0 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 22 04:07:20 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Jan 22 04:28:49 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a6e39695 |
| 7 |
|
| 8 |
Rename target_mounts, devpts and sort members. |
| 9 |
|
| 10 |
--- |
| 11 |
catalyst/base/stagebase.py | 8 +++++--- |
| 12 |
catalyst/defaults.py | 14 +++++++------- |
| 13 |
2 files changed, 12 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 16 |
index f42d943..fd7fda5 100644 |
| 17 |
--- a/catalyst/base/stagebase.py |
| 18 |
+++ b/catalyst/base/stagebase.py |
| 19 |
@@ -13,11 +13,12 @@ from catalyst.support import (CatalystError, msg, file_locate, normpath, |
| 20 |
from catalyst.base.targetbase import TargetBase |
| 21 |
from catalyst.base.clearbase import ClearBase |
| 22 |
from catalyst.base.genbase import GenBase |
| 23 |
-from catalyst.defaults import target_mounts |
| 24 |
+from catalyst.defaults import TARGET_MOUNT_DEFAULTS |
| 25 |
from catalyst.lock import LockDir |
| 26 |
from catalyst.fileops import ensure_dirs, pjoin |
| 27 |
from catalyst.base.resume import AutoResume |
| 28 |
|
| 29 |
+ |
| 30 |
class StageBase(TargetBase, ClearBase, GenBase): |
| 31 |
""" |
| 32 |
This class does all of the chroot setup, copying of files, etc. It is |
| 33 |
@@ -191,7 +192,8 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 34 |
file_locate(self.settings,["portage_confdir"],expand=0) |
| 35 |
|
| 36 |
""" Setup our mount points """ |
| 37 |
- self.target_mounts = target_mounts.copy() |
| 38 |
+ # initialize our target mounts. |
| 39 |
+ self.target_mounts = TARGET_MOUNT_DEFAULTS.copy() |
| 40 |
if "snapcache" in self.settings["options"]: |
| 41 |
self.mounts=["proc", "dev", 'portdir', 'distdir', 'port_tmpdir'] |
| 42 |
self.mountmap={"proc":"/proc", "dev":"/dev", "pts":"/dev/pts", |
| 43 |
@@ -202,7 +204,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 44 |
self.mountmap={"proc":"/proc", "dev":"/dev", "pts":"/dev/pts", |
| 45 |
"distdir":self.settings["distdir"], "port_tmpdir":"tmpfs"} |
| 46 |
if os.uname()[0] == "Linux": |
| 47 |
- self.mounts.append("pts") |
| 48 |
+ self.mounts.append("devpts") |
| 49 |
|
| 50 |
self.set_mounts() |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 54 |
index 0b98d83..11cecb3 100644 |
| 55 |
--- a/catalyst/defaults.py |
| 56 |
+++ b/catalyst/defaults.py |
| 57 |
@@ -80,18 +80,18 @@ confdefaults={ |
| 58 |
} |
| 59 |
|
| 60 |
|
| 61 |
-target_mounts = { |
| 62 |
- "proc": "/proc", |
| 63 |
+TARGET_MOUNT_DEFAULTS = { |
| 64 |
+ "ccache": "/var/tmp/ccache", |
| 65 |
"dev": "/dev", |
| 66 |
- "pts": "/dev/pts", |
| 67 |
- "portdir": "/usr/portage", |
| 68 |
+ "devpts": "/dev/pts", |
| 69 |
"distdir": "/usr/portage/distfiles", |
| 70 |
+ "icecream": "/usr/lib/icecc/bin", |
| 71 |
+ "kerncache": "/tmp/kerncache", |
| 72 |
"packagedir": "/usr/portage/packages", |
| 73 |
+ "portdir": "/usr/portage", |
| 74 |
"port_tmpdir": "/var/tmp/portage", |
| 75 |
- "kerncache": "/tmp/kerncache", |
| 76 |
- "ccache": "/var/tmp/ccache", |
| 77 |
- "icecream": "/var/cache/icecream", |
| 78 |
"port_logdir": "/var/log/portage", |
| 79 |
+ "proc": "/proc", |
| 80 |
} |
| 81 |
|
| 82 |
# legend: key: message |
Archives