From 00a9861367f8863436230a805f9514373fda984e Mon Sep 17 00:00:00 2001 From: Lev Veyde Date: Wed, 21 Apr 2021 21:04:01 +0300 Subject: [PATCH] Updated the deprecated ks argument name (to the current inst.ks) Signed-off-by: Lev Veyde --- pungi/phases/buildinstall.py | 2 +- tests/test_buildinstall.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py index 04e46870..a43e3707 100644 --- a/pungi/phases/buildinstall.py +++ b/pungi/phases/buildinstall.py @@ -368,7 +368,7 @@ def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS, logger=None): # double-escape volid in yaboot.conf new_volid = volid_escaped_2 if "yaboot" in config else volid_escaped - ks = (" ks=hd:LABEL=%s:/ks.cfg" % new_volid) if ks_file else "" + ks = (" inst.ks=hd:LABEL=%s:/ks.cfg" % new_volid) if ks_file else "" # pre-f18 data = re.sub(r":CDLABEL=[^ \n]*", r":CDLABEL=%s%s" % (new_volid, ks), data) diff --git a/tests/test_buildinstall.py b/tests/test_buildinstall.py index a8c3ddf7..c2051f83 100644 --- a/tests/test_buildinstall.py +++ b/tests/test_buildinstall.py @@ -2161,7 +2161,7 @@ class TestTweakConfigs(PungiTestCase): ) for cfg in configs: self.assertFileContent( - cfg, ":LABEL=new\\x20volid ks=hd:LABEL=new\\x20volid:/ks.cfg\n" + cfg, ":LABEL=new\\x20volid inst.ks=hd:LABEL=new\\x20volid:/ks.cfg\n" ) def test_tweak_configs_yaboot(self): @@ -2173,5 +2173,5 @@ class TestTweakConfigs(PungiTestCase): tweak_configs(self.topdir, "new volid", os.path.join(self.topdir, "ks.cfg")) for cfg in configs: self.assertFileContent( - cfg, ":LABEL=new\\\\x20volid ks=hd:LABEL=new\\\\x20volid:/ks.cfg\n" + cfg, ":LABEL=new\\\\x20volid inst.ks=hd:LABEL=new\\\\x20volid:/ks.cfg\n" )