almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Updated the deprecated ks argument name (to the current inst.ks)

Browse Source 
Signed-off-by: Lev Veyde <lveyde@redhat.com>
This commit is contained in:
Lev Veyde 2021-04-21 21:04:01 +03:00
parent e866d22c04
commit 00a9861367
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/phases/buildinstall.py
View File

@ -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)

4
tests/test_buildinstall.py
View File

@ -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"
)