sablink/molecule-plugins
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[molecule] add support for outer_chroot_script_after (to be executed after inner chroot script)

Browse Source
This commit is contained in:
Fabio Erculiani
2009-10-27 16:10:49 +01:00
parent 352f96b2d7
commit da373bd9b4
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
molecule/specs/plugins/builtin.py
+25 -3
View File
@@ -209,6 +209,24 @@ class ChrootHandler(GenericExecutionStep):
)
)
# run outer chroot script
exec_script = self.metadata.get('outer_chroot_script')
if exec_script:
os.environ['CHROOT_DIR'] = self.source_dir
self.Output.updateProgress("[%s|%s] %s: %s" % (
blue("ChrootHandler"),darkred(self.spec_name),
_("spawning"),[exec_script],
)
)
rc = molecule.utils.exec_cmd([exec_script])
if rc != 0:
self.Output.updateProgress("[%s|%s] %s: %s" % (
blue("ChrootHandler"),darkred(self.spec_name),
_("outer chroot hook failed"),rc,
)
)
return rc
# run inner chroot script
exec_script = self.metadata.get('inner_chroot_script')
if exec_script:
@@ -241,8 +259,8 @@ class ChrootHandler(GenericExecutionStep):
)
return rc
# run outer chroot script
exec_script = self.metadata.get('outer_chroot_script')
# run outer chroot script after
exec_script = self.metadata.get('outer_chroot_script_after')
if exec_script:
os.environ['CHROOT_DIR'] = self.source_dir
self.Output.updateProgress("[%s|%s] %s: %s" % (
@@ -254,7 +272,7 @@ class ChrootHandler(GenericExecutionStep):
if rc != 0:
self.Output.updateProgress("[%s|%s] %s: %s" % (
blue("ChrootHandler"),darkred(self.spec_name),
_("outer chroot hook failed"),rc,
_("outer chroot hook (after inner) failed"),rc,
)
)
return rc
@@ -563,6 +581,10 @@ class LivecdSpec(GenericSpec):
'cb': self.valid_path_string,
've': self.ve_string_stripper,
},
'outer_chroot_script_after': {
'cb': self.valid_path_string,
've': self.ve_string_stripper,
},
'destination_livecd_root': {
'cb': self.valid_path_string,
've': self.ve_string_stripper,
molecule/specs/plugins/remaster.py
+4
View File
@@ -342,6 +342,10 @@ class RemasterSpec(GenericSpec):
'cb': self.valid_path_string,
've': self.ve_string_stripper,
},
'outer_chroot_script_after': {
'cb': self.valid_path_string,
've': self.ve_string_stripper,
},
'extra_mkisofs_parameters': {
'cb': self.always_valid,
've': self.ve_string_splitter,