| 1 |
commit: 4081b20f9f1c6837ae06704422215eb51910491b |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 18 19:08:59 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 18 19:08:59 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=4081b20f |
| 7 |
|
| 8 |
grs/MountDirectories.py: location of /usr/portage is configurable |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
grs/Constants.py | 2 ++ |
| 13 |
grs/Interpret.py | 3 ++- |
| 14 |
grs/MountDirectories.py | 5 +++-- |
| 15 |
3 files changed, 7 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/grs/Constants.py b/grs/Constants.py |
| 18 |
index bdaee25..3c4b3bc 100644 |
| 19 |
--- a/grs/Constants.py |
| 20 |
+++ b/grs/Constants.py |
| 21 |
@@ -87,6 +87,7 @@ class Constants(): |
| 22 |
'tmpdir' : '/var/tmp/grs/%s', |
| 23 |
'workdir' : '/var/tmp/grs/%s/work', |
| 24 |
'package' : '/var/tmp/grs/%s/packages', |
| 25 |
+ 'portage' : '/usr/portage', |
| 26 |
'kernelroot' : '/var/tmp/grs/%s/kernel', |
| 27 |
'portage_configroot' : '/var/tmp/grs/%s/system', |
| 28 |
'pidfile' : '/run/grs-%s.pid' |
| 29 |
@@ -161,6 +162,7 @@ CONST.LOGFILE = '/var/log/grs.log' |
| 30 |
CONST.TMPDIR = '/var/tmp/grs' |
| 31 |
CONST.WORKDIR = '/var/tmp/grs/work' |
| 32 |
CONST.PACKAGE = '/var/tmp/grs/package' |
| 33 |
+CONST.PORTAGE = '/usr/portage' |
| 34 |
CONST.KERNELROOT = '/var/tmp/grs/kernel' |
| 35 |
CONST.PORTAGE_CONFIGROOT = '/var/tmp/grs/system' |
| 36 |
CONST.PIDFILE = '/run/grs.pid' |
| 37 |
|
| 38 |
diff --git a/grs/Interpret.py b/grs/Interpret.py |
| 39 |
index 422357d..a06807f 100644 |
| 40 |
--- a/grs/Interpret.py |
| 41 |
+++ b/grs/Interpret.py |
| 42 |
@@ -119,6 +119,7 @@ class Interpret(Daemon): |
| 43 |
tmpdir = CONST.tmpdirs[self.run_number] |
| 44 |
workdir = CONST.workdirs[self.run_number] |
| 45 |
package = CONST.packages[self.run_number] |
| 46 |
+ portage = CONST.portages[self.run_number] |
| 47 |
kernelroot = CONST.kernelroots[self.run_number] |
| 48 |
portage_configroot = CONST.portage_configroots[self.run_number] |
| 49 |
|
| 50 |
@@ -128,7 +129,7 @@ class Interpret(Daemon): |
| 51 |
_lo = Log(logfile) |
| 52 |
_sy = Synchronize(repo_uri, name, libdir, logfile) |
| 53 |
_se = Seed(stage_uri, tmpdir, portage_configroot, package, logfile) |
| 54 |
- _md = MountDirectories(portage_configroot, package, logfile) |
| 55 |
+ _md = MountDirectories(portage_configroot, package, portage, logfile) |
| 56 |
_po = Populate(libdir, workdir, portage_configroot, logfile) |
| 57 |
_ru = RunScript(libdir, portage_configroot, logfile) |
| 58 |
_pc = PivotChroot(tmpdir, portage_configroot, logfile) |
| 59 |
|
| 60 |
diff --git a/grs/MountDirectories.py b/grs/MountDirectories.py |
| 61 |
index 692c320..a1a42af 100644 |
| 62 |
--- a/grs/MountDirectories.py |
| 63 |
+++ b/grs/MountDirectories.py |
| 64 |
@@ -27,7 +27,7 @@ class MountDirectories(): |
| 65 |
""" |
| 66 |
|
| 67 |
def __init__(self, portage_configroot=CONST.PORTAGE_CONFIGROOT, \ |
| 68 |
- package=CONST.PACKAGE, logfile=CONST.LOGFILE): |
| 69 |
+ package=CONST.PACKAGE, portage=CONST.PORTAGE, logfile=CONST.LOGFILE): |
| 70 |
# The order is respected. Note that 'dev' needs to be mounted beore 'dev/pts'. |
| 71 |
self.directories = [ |
| 72 |
'dev', |
| 73 |
@@ -35,12 +35,13 @@ class MountDirectories(): |
| 74 |
{'dev/shm' : ('tmpfs', 'shm')}, |
| 75 |
'proc', |
| 76 |
'sys', |
| 77 |
- 'usr/portage', |
| 78 |
+ [portage, 'usr/portage'], |
| 79 |
[package, 'usr/portage/packages'] |
| 80 |
] |
| 81 |
# Once initiated, we only work with one portage_configroot |
| 82 |
self.portage_configroot = portage_configroot |
| 83 |
self.package = package |
| 84 |
+ self.portage = portage |
| 85 |
self.logfile = logfile |
| 86 |
# We need to umount in the reverse order |
| 87 |
self.rev_directories = deepcopy(self.directories) |
Archives