Compare commits

...

2 Commits

2
.gitignore vendored

@ -1 +1 @@
SOURCES/lorax-34.9.23.tar.gz SOURCES/lorax-34.9.26.tar.gz

@ -1 +1 @@
77d285fa8f93c80bcc7d133202738fb5761682f9 SOURCES/lorax-34.9.23.tar.gz d0dcdb64f67e0835d8dfb1bfe76da510e7df5579 SOURCES/lorax-34.9.26.tar.gz

@ -0,0 +1,27 @@
From 5aed220986528c282c92125fc11e61ee67031555 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
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

@ -1,7 +1,7 @@
From 850c748ef3d7ad4e4cd36216d797736e450fba08 Mon Sep 17 00:00:00 2001 From 850c748ef3d7ad4e4cd36216d797736e450fba08 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru> From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 12 Aug 2024 12:15:27 +0300 Date: Mon, 12 Aug 2024 12:15:27 +0300
Subject: [PATCH 4/4] Set LatGrkCyr-8x16 as default font instead of eurlatgr Subject: [PATCH 4/4] Set latarcyrheb-sun16 as default font instead of eurlatgr
--- ---
share/templates.d/99-generic/config_files/common/i18n | 2 +- share/templates.d/99-generic/config_files/common/i18n | 2 +-
@ -22,7 +22,7 @@ index 2bd7892..1456d03 100644
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
KEYMAP=us KEYMAP=us
-FONT=eurlatgr -FONT=eurlatgr
+FONT=LatGrkCyr-8x16 +FONT=latarcyrheb-sun16
-- --
2.46.0 2.46.0

@ -3,8 +3,8 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: lorax Name: lorax
Version: 34.9.23 Version: 34.9.26
Release: 1%{?dist}.inferit.3 Release: 1%{?dist}.inferit.1
Summary: Tool for creating the anaconda install images Summary: Tool for creating the anaconda install images
License: GPLv2+ License: GPLv2+
@ -20,6 +20,7 @@ Patch1001: 0001-Backport-dracut-chroot-umount-fix.patch
Patch1002: 0002-Fix-replace-command-utf8-handling.patch Patch1002: 0002-Fix-replace-command-utf8-handling.patch
Patch1003: 0003-Add-iconv-template-command.patch Patch1003: 0003-Add-iconv-template-command.patch
Patch1004: 0004-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.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: python3-devel
BuildRequires: make BuildRequires: make
@ -195,8 +196,21 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%{_datadir}/lorax/templates.d/* %{_datadir}/lorax/templates.d/*
%changelog %changelog
* Mon Aug 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.23-1.inferit.3 * Mon Dec 09 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.26-1.inferit.1
- Set LatGrkCyr-8x16 as default font instead of eurlatg - Our isolinux.cfg is in cp866 encoding
* Mon Aug 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.26-1.inferit
- Set latarcyrheb-sun16 as default font instead of eurlatg
* Thu Jul 18 2024 Brian C. Lane <bcl@redhat.com> 34.9.26-1
- monitor: Skip repo errors involving CDROM/file source (bcl) (bcl)
Resolves: RHEL-4658
- rsyslog.conf: Update to use current config syntax (bcl) (bcl)
Resolves: RHEL-46857
* Tue Feb 06 2024 Brian C. Lane <bcl@redhat.com> 34.9.25-1
- templates: Remove libreport bugzilla plugins (bcl)
Resolves: RHEL-24420
* Fri Jan 19 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.23-1.inferit.2 * Fri Jan 19 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.23-1.inferit.2
- bump retries count - bump retries count

Loading…
Cancel
Save