From ce6d47a15dc4c7d5c87a8cf26f67cd5b1576520e Mon Sep 17 00:00:00 2001 From: David Cassany Date: Mon, 9 Jan 2017 18:33:38 +0100 Subject: [PATCH] Running config.sh after including the image repositories This commit rearranges some code lines in order to run the config.sh script after the repositories of the image have been included, this way repositories can be trusted and refreshed in config.sh script. --- kiwi/tasks/system_build.py | 8 +++++--- kiwi/tasks/system_prepare.py | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kiwi/tasks/system_build.py b/kiwi/tasks/system_build.py index b0716c52..ae245b22 100644 --- a/kiwi/tasks/system_build.py +++ b/kiwi/tasks/system_build.py @@ -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() diff --git a/kiwi/tasks/system_prepare.py b/kiwi/tasks/system_prepare.py index 467cf405..d88ea641 100644 --- a/kiwi/tasks/system_prepare.py +++ b/kiwi/tasks/system_prepare.py @@ -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']: