Add a common module library.

This commit is contained in:
Ian Gulliver
2016-05-19 00:12:44 +00:00
parent fc7a670a1f
commit 0274794674
2 changed files with 74 additions and 4 deletions

View File

@@ -216,17 +216,21 @@ class ImageBuilder(object):
os.fchmod(fh.fileno(), 0o744)
def _InstallPackages(self, chroot_path):
os.environ['DEBIAN_FRONTEND'] = 'noninteractive'
env = os.environ.copy()
env['DEBIAN_FRONTEND'] = 'noninteractive'
self._ExecChroot(
chroot_path,
'apt-get',
'update')
'update',
env=env)
self._ExecChroot(
chroot_path,
'apt-get',
'install',
'--assume-yes',
*self._BASE_PACKAGES)
*self._BASE_PACKAGES,
env=env)
def _WriteVersion(self, chroot_path, timestamp):
with open(os.path.join(chroot_path, 'etc', 'iconograph.json'), 'w') as fh:
@@ -240,13 +244,17 @@ class ImageBuilder(object):
fh.write('\n')
def _RunModules(self, chroot_path):
env = os.environ.copy()
env['PYTHONPATH'] = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), 'module_lib'))
for module in self._modules:
self._Exec(
'%(module)s --chroot-path=%(chroot_path)s' % {
'module': module,
'chroot_path': chroot_path,
},
shell=True)
shell=True,
env=env)
def _CleanPackages(self, chroot_path):
self._ExecChroot(