summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Styk <mastyk@redhat.com>2020-03-27 09:40:19 +0100
committerMartin Styk <188918+StykMartin@users.noreply.github.com>2020-03-27 16:03:50 +0100
commitbf7ead76125feabf89baa40226b7fe1614db9c22 (patch)
tree5ea8d20d3876ced2290352688d4051a9f20cd72d
parentdb040a666f7eb7ecd7831c821868002a2bea9e71 (diff)
fix: use inst.ks in RHVH installation instead of ks
Signed-off-by: Martin Styk <mastyk@redhat.com>
-rwxr-xr-xLabController/src/bkr/labcontroller/distro_import.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/LabController/src/bkr/labcontroller/distro_import.py b/LabController/src/bkr/labcontroller/distro_import.py
index 8fcc5db..6abede9 100755
--- a/LabController/src/bkr/labcontroller/distro_import.py
+++ b/LabController/src/bkr/labcontroller/distro_import.py
@@ -1542,7 +1542,11 @@ class TreeInfoRHVH4(TreeInfoMixin, Importer):
self.tree["kernel_options"] = kopts + " inst.stage2=%s" % self.parser.url
img_rpm = self._find_image_update_rpm()
ks_meta = self.tree.get("ks_meta") or ""
- self.tree["ks_meta"] = ks_meta + " autopart_type=thinp liveimg=%s" % img_rpm
+
+ # RHVH assumes that installation is happening based on 'inst.ks' on kernel cmdline
+ ks_keyword = 'ks_keyword=inst.ks'
+ autopart_type = 'autopart_type=thinp liveimg={}'.format(img_rpm)
+ self.tree["ks_meta"] = "{} {} {}".format(ks_meta, autopart_type, ks_keyword)
def _find_image_update_rpm(self):
base = dnf.Base()