almalinux/kiwi-el8
14
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #217 from SUSE/config_after_include_repos

Browse Source 
Running config.sh after including the image repositories
This commit is contained in:
Marcus Schäfer 2017-01-10 08:42:02 +01:00 committed by GitHub
commit 83fa960d09
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiwi/tasks/system_build.py
View File

@ -174,7 +174,6 @@ class SystemBuildTask(CliTask):
setup.import_description()
setup.import_overlay_files()
setup.call_config_script()
setup.import_image_identifier()
setup.setup_groups()
setup.setup_users()
@ -185,13 +184,16 @@ class SystemBuildTask(CliTask):
system.pinch_system(
manager=manager, force=True
)
# make sure system and manager instances are cleaned up now
del system
# make sure manager instance is cleaned up now
del manager
# setup permanent image repositories after cleanup
if self.xml_state.has_repositories_marked_as_imageinclude():
setup.import_repositories_marked_as_imageinclude()
setup.call_config_script()
# make sure system instance is cleaned up now
del system
setup.call_image_script()

8
kiwi/tasks/system_prepare.py
View File

@ -167,7 +167,6 @@ class SystemPrepareTask(CliTask):
setup.import_description()
setup.import_overlay_files()
setup.call_config_script()
setup.import_image_identifier()
setup.setup_groups()
setup.setup_users()
@ -179,13 +178,16 @@ class SystemPrepareTask(CliTask):
manager=manager, force=True
)
# make sure system and manager instances are cleaned up now
del system
# make sure manager instance is cleaned up now
del manager
# setup permanent image repositories after cleanup
if self.xml_state.has_repositories_marked_as_imageinclude():
setup.import_repositories_marked_as_imageinclude()
setup.call_config_script()
# make sure system instance is cleaned up now
del system
def _help(self):
if self.command_args['help']: