From 920141de95af5f54aeb731924cee51cbbb2a8e37 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 9 Dec 2024 13:25:40 +0300 Subject: [PATCH] Our isolinux.cfg is in cp866 encoding --- ...ur-isolinux.cfg-is-in-cp866-encoding.patch | 27 +++++++++++++++++++ SPECS/lorax.spec | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-Our-isolinux.cfg-is-in-cp866-encoding.patch diff --git a/SOURCES/0001-Our-isolinux.cfg-is-in-cp866-encoding.patch b/SOURCES/0001-Our-isolinux.cfg-is-in-cp866-encoding.patch new file mode 100644 index 0000000..45170ca --- /dev/null +++ b/SOURCES/0001-Our-isolinux.cfg-is-in-cp866-encoding.patch @@ -0,0 +1,27 @@ +From 5aed220986528c282c92125fc11e61ee67031555 Mon Sep 17 00:00:00 2001 +From: tigro +Date: Mon, 9 Dec 2024 13:22:40 +0300 +Subject: [PATCH] Our isolinux.cfg is in cp866 encoding + +--- + src/bin/mkksiso | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bin/mkksiso b/src/bin/mkksiso +index 42cdbfb..c9cfedd 100755 +--- a/src/bin/mkksiso ++++ b/src/bin/mkksiso +@@ -294,8 +294,8 @@ def EditIsolinux(rm_args, add_args, new_volid, old_volid, tmpdir): + change_volid = old_volid != new_volid + + # Edit the config file, save the new one as .new +- with open(orig_cfg, "r") as in_fp: +- with open(orig_cfg + ".new", "w") as out_fp: ++ with open(orig_cfg, "r", encoding="cp866") as in_fp: ++ with open(orig_cfg + ".new", "w", encoding="cp866") as out_fp: + for line in in_fp: + if change_volid and old_volid in line: + line = line.replace(old_volid, new_volid) +-- +2.47.1 + diff --git a/SPECS/lorax.spec b/SPECS/lorax.spec index effcc3f..a533823 100644 --- a/SPECS/lorax.spec +++ b/SPECS/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 34.9.26 -Release: 1%{?dist}.inferit +Release: 1%{?dist}.inferit.1 Summary: Tool for creating the anaconda install images License: GPLv2+ @@ -20,6 +20,7 @@ Patch1001: 0001-Backport-dracut-chroot-umount-fix.patch Patch1002: 0002-Fix-replace-command-utf8-handling.patch Patch1003: 0003-Add-iconv-template-command.patch Patch1004: 0004-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch +Patch1005: 0001-Our-isolinux.cfg-is-in-cp866-encoding.patch BuildRequires: python3-devel BuildRequires: make @@ -195,6 +196,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Mon Dec 09 2024 Arkady L. Shane - 34.9.26-1.inferit.1 +- Our isolinux.cfg is in cp866 encoding + * Mon Aug 12 2024 Arkady L. Shane - 34.9.26-1.inferit - Set latarcyrheb-sun16 as default font instead of eurlatg