From 72f49ea9aa8ea6004072334d0b702463c44ee6fa Mon Sep 17 00:00:00 2001
From: Eugenio Paolantonio <eugenio.paolantonio@suse.com>
Date: Tue, 4 Feb 2025 15:40:08 +0100
Subject: [PATCH] live: fix_bootconfig.s390x: restore initrd.off naming for the
 initrd offset

See discussion in bsc#1236781, and gh#agama-project/agama#1969.

This essentially reverts c3c8fc4.

Signed-off-by: Eugenio Paolantonio <eugenio.paolantonio@suse.com>
---
 live/config-cdroot/fix_bootconfig.s390x | 14 +++++++-------
 live/src/agama-installer.changes        |  7 +++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/live/config-cdroot/fix_bootconfig.s390x b/live/config-cdroot/fix_bootconfig.s390x
index c7863b7b72..31ae0fbb43 100755
--- a/live/config-cdroot/fix_bootconfig.s390x
+++ b/live/config-cdroot/fix_bootconfig.s390x
@@ -29,7 +29,7 @@
 # │   └── s390x
 # │       ├── cd.ikr
 # │       ├── initrd
-# │       ├── initrd.ofs
+# │       ├── initrd.off
 # │       ├── initrd.siz
 # │       ├── linux
 # │       ├── parmfile
@@ -97,8 +97,8 @@ initrd_siz_ofs=0x00010414
 initrd_ofs=0x01000000
 parmfile_ofs=0x00010480
 
-# Create initrd.ofs (note: 32 bit, stored in big endian).
-printf "%08x" $((initrd_ofs)) | xxd -r -p - $boot_dir/initrd.ofs
+# Create initrd.off (note: 32 bit, stored in big endian).
+printf "%08x" $((initrd_ofs)) | xxd -r -p - $boot_dir/initrd.off
 
 # Create initrd.siz (note: 32 bit, stored in big endian).
 read initrd_size x < <(du -b $boot_dir/initrd)
@@ -108,7 +108,7 @@ printf "%08x" $((initrd_size)) | xxd -r -p - $boot_dir/initrd.siz
 cat >$boot_dir/suse.ins <<XXX
 * SUSE Linux for IBM z Systems Installation System
 linux 0x00000000
-initrd.ofs $initrd_ofs_ofs
+initrd.off $initrd_ofs_ofs
 initrd.siz $initrd_siz_ofs
 initrd $initrd_ofs
 parmfile $parmfile_ofs
@@ -118,7 +118,7 @@ XXX
 cat >$dst/suse.ins <<XXX
 * SUSE Linux for IBM z Systems Installation System
 boot/s390x/linux 0x00000000
-boot/s390x/initrd.ofs $initrd_ofs_ofs
+boot/s390x/initrd.off $initrd_ofs_ofs
 boot/s390x/initrd.siz $initrd_siz_ofs
 boot/s390x/initrd $initrd_ofs
 boot/s390x/parmfile $parmfile_ofs
@@ -128,7 +128,7 @@ XXX
 cat >$dst/susehmc.ins <<XXX
 * SUSE Linux for IBM z Systems Installation System via HMC
 boot/s390x/linux 0x00000000
-boot/s390x/initrd.ofs $initrd_ofs_ofs
+boot/s390x/initrd.off $initrd_ofs_ofs
 boot/s390x/initrd.siz $initrd_siz_ofs
 boot/s390x/initrd $initrd_ofs
 boot/s390x/parmfile.hmc $parmfile_ofs
@@ -158,7 +158,7 @@ XXX
 
 # Create cd.ikr with all the file blobs mentioned in suse.ins.
 dd status=none if=$boot_dir/linux of=$boot_dir/cd.ikr
-dd status=none conv=notrunc obs=1 seek=$((initrd_ofs_ofs)) if=$boot_dir/initrd.ofs of=$boot_dir/cd.ikr
+dd status=none conv=notrunc obs=1 seek=$((initrd_ofs_ofs)) if=$boot_dir/initrd.off of=$boot_dir/cd.ikr
 dd status=none conv=notrunc obs=1 seek=$((initrd_siz_ofs)) if=$boot_dir/initrd.siz of=$boot_dir/cd.ikr
 dd status=none conv=notrunc obs=4096 seek=$((initrd_ofs/4096)) if=$boot_dir/initrd of=$boot_dir/cd.ikr
 # clear kernel cmdline area; it's actually 4 kiB, but 1 block should be more than enough
diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes
index 2882562a41..cd788bf436 100644
--- a/live/src/agama-installer.changes
+++ b/live/src/agama-installer.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb  4 14:42:46 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
+
+- live: fix_bootconfig.s390x: restore initrd.off naming for the initrd offset
+  This essentially reverts the previous change (bsc#1236781, gh#agama-project/agama#1969,
+  gh#agama-project/agama#1974)
+
 -------------------------------------------------------------------
 Mon Feb  3 23:08:34 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>