From db1bbd2b13329da5906fe295e9d8e4e68e4cee55 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: May 19 2020 08:22:20 +0000
Subject: PR#2262: Pass bootloader append option to livemedia builds


Merges #2262
https://pagure.io/koji/pull-request/2262

Fixes: #2258
https://pagure.io/koji/issue/2258
Pass 'bootloader --append' in livemedia builds

---

diff --git a/builder/kojid b/builder/kojid
index a105d75..63467ac 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -3067,6 +3067,16 @@ class ImageTask(BaseTaskHandler):
         self.uploadFile(kskoji)
         return broot.path_without_to_within(kskoji)  # absolute path within chroot
 
+    def getBootloaderAppend(self):
+        """
+        Return `bootloader --append`
+        This is passed to livemedia `--extra-boot-args`
+        """
+        try:
+            return self.ks.handler.bootloader.appendLine
+        except AttributeError:
+            return
+
     def getImagePackages(self, cachepath):
         """
         Read RPM header information from the yum cache available in the
@@ -3511,6 +3521,7 @@ class LiveMediaTask(ImageTask):
         kspath = self.fetchKickstart(broot, ksfile, target_info['build_tag_name'])
         self.readKickstart(kspath, opts)
         kskoji = self.prepareKickstart(repo_info, target_info, arch, broot, opts)
+        b_append = self.getBootloaderAppend()
 
         # arbitrary paths in chroot
         livemedia_log = broot.tmpdir(within=True) + '/lmc-logs/livemedia-out.log'
@@ -3548,6 +3559,10 @@ class LiveMediaTask(ImageTask):
         if arch == 'x86_64':
             cmd.append('--macboot')
 
+        if b_append:
+            cmd.extend(['--extra-boot-args',
+                        '--append=\"%s\"' % b_append])
+
         if 'lorax_url' in self.opts:
             templates_dir = self.fetch_lorax_templates_from_scm(broot)
             cmd.extend(['--lorax-templates', templates_dir])