[PATCH] inject the url of the install tree into the kickstart used for generating images

Mike McLean mikem at redhat.com
Sat Jun 6 22:10:44 UTC 2015


On 06/06/2015 05:52 PM, Brian Stinson wrote:
> From: Brian Stinson <bstinson at redhat.com>
> Date: Sat, 6 Jun 2015 16:43:40 -0500

applied

> ---
>   builder/kojid | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/builder/kojid b/builder/kojid
> index ad2cf1f..b6b79c1 100755
> --- a/builder/kojid
> +++ b/builder/kojid
> @@ -2841,7 +2841,7 @@ class OzImageTask(BaseTaskHandler):
>                                       "'%s' : %s" % (kspath, e))
>           return ks
>
> -    def prepareKickstart(self, kspath):
> +    def prepareKickstart(self, kspath, install_tree):
>           """
>           Process the ks file to be used for controlled image generation. This
>           method also uploads the modified kickstart file to the task output
> @@ -2878,6 +2878,8 @@ class OzImageTask(BaseTaskHandler):
>               self.logger.debug('BASEURL: %s' % baseurl)
>               ks.handler.repo.repoList.append(repo_class(
>                   baseurl=baseurl, name='koji-override-0'))
> +        # inject the URL of the install tree into the kickstart
> +        ks.handler.url.url = install_tree
>           return ks
>
>       def writeKickstart(self, ksobj, ksname):
> @@ -3327,7 +3329,7 @@ class BaseImageTask(OzImageTask):
>
>           # First, prepare the kickstart to use the repos we tell it
>           kspath = self.fetchKickstart()
> -        ks = self.prepareKickstart(kspath)
> +        ks = self.prepareKickstart(kspath, inst_tree)
>           kskoji = self.writeKickstart(ks,
>               os.path.join(self.workdir, 'koji-%s-%i-base.ks' %
>               (self.target_info['build_tag_name'], self.id)))
>



More information about the koji-devel mailing list