rpms/rear
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Restore the pre-2.8 OUTPUT=IPL behaviour

Browse Source 
Resolves: RHEL-102563
This commit is contained in:
Lukáš Zaoral 2025-07-30 15:49:11 +02:00
parent 9f90e070f3
commit 20400ac460
No known key found for this signature in database
GPG Key ID: 39157506DD67752D
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rear-restore-output-IPL-RHEL-102563.patch Normal file
View File

@ -0,0 +1,34 @@
commit 7c674a213e25eb70ee4cf8996907a4fc19e2bb4e
Author: Pavel Cahyna <pcahyna@redhat.com>
Date: Mon Jul 28 18:02:24 2025 +0200
Preserve compatibility when OUTPUT=IPL is used
OUTPUT=IPL did not respect RAMDISK_SUFFIX when it was a separate
output method. Restore this behavior. This restores the naming
convention for output files (kernel and ramdisk).
(cherry picked from commit b473c3cf3cdfd69d602bc28bf3abd47a0fa09637)
diff --git a/usr/share/rear/prep/Linux-s390/034_check_config.sh b/usr/share/rear/prep/Linux-s390/034_check_config.sh
index 0f3296812..a1b1d76f4 100644
--- a/usr/share/rear/prep/Linux-s390/034_check_config.sh
+++ b/usr/share/rear/prep/Linux-s390/034_check_config.sh
@@ -1,6 +1,17 @@
if [ "$OUTPUT" = "IPL" ]; then
LogPrintError "Warning: OUTPUT=IPL is deprecated. Use OUTPUT=RAMDISK instead."
OUTPUT=RAMDISK
+ # OUTPUT=IPL did not respect RAMDISK_SUFFIX when it was a separate
+ # output method.
+ # Preserve compatibility when OUTPUT=IPL is still used.
+ # Note: overriding the value of RAMDISK_SUFFIX here is fine,
+ # since the only place where RAMDISK_SUFFIX is used is the
+ # OUTPUT=RAMDISK code, and if OUTPUT=IPL, the user has no use
+ # for RAMDISK_SUFFIX, so presumably its value has come from default.conf
+ # (so we do not risk clobbering an user-specified value).
+ # If users intend RAMDISK_SUFFIX to be used, they should use
+ # OUTPUT=RAMDISK.
+ RAMDISK_SUFFIX=""
fi
if [ "$OUTPUT" != "RAMDISK" ] ; then

3
rear.spec
View File

@ -46,6 +46,9 @@ Patch204: rear-bz2120736.patch
Patch205: rear-bz2188593-nbu-systemd.patch
Patch206: rear-nbu-RHEL-17390-RHEL-17393.patch
# restore the pre-2.8 OUTPUT=IPL behaviour
Patch207: rear-restore-output-IPL-RHEL-102563.patch
# rear contains only bash scripts plus documentation so that on first glance it could be "BuildArch: noarch"
# but actually it is not "noarch" because it only works on those architectures that are explicitly supported.
# Of course the rear bash scripts can be installed on any architecture just as any binaries can be installed on any architecture.