Skip to content

live: fix_bootconfig.s390x: use initrd.ofs for the initrd offset filename #1969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imobachgs merged 2 commits into from
Feb 4, 2025
Merged

live: fix_bootconfig.s390x: use initrd.ofs for the initrd offset filename #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de4d1c0
live: fix_bootconfig: exit on failures
g7 Feb 3, 2025
eab53bc
live: fix_bootconfig.s390x: use initrd.ofs for the initrd offset file…
g7 Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions live/config-cdroot/fix_bootconfig.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
# https://github.com/openSUSE/agama/issues/1609
# KIWI config

set -e

dst="$1"

if [ ! -d "$dst" ] ; then
Expand Down
2 changes: 2 additions & 0 deletions live/config-cdroot/fix_bootconfig.ppc64le
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
# └── bootinfo.txt
#

set -e

dst="$1"

if [ ! -d "$dst" ] ; then
Expand Down
16 changes: 9 additions & 7 deletions live/config-cdroot/fix_bootconfig.s390x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# │   └── s390x
# │   ├── cd.ikr
# │   ├── initrd
# │   ├── initrd.off
# │   ├── initrd.ofs
# │   ├── initrd.siz
# │   ├── linux
# │   ├── parmfile
Expand All @@ -40,6 +40,8 @@
# └── susehmc.ins
#

set -e

dst="$1"

if [ ! -d "$dst" ] ; then
Expand Down Expand Up @@ -95,8 +97,8 @@ initrd_siz_ofs=0x00010414
initrd_ofs=0x01000000
parmfile_ofs=0x00010480

# Create initrd.off (note: 32 bit, stored in big endian).
printf "%08x" $((initrd_ofs)) | xxd -r -p - $boot_dir/initrd.off
# Create initrd.ofs (note: 32 bit, stored in big endian).
printf "%08x" $((initrd_ofs)) | xxd -r -p - $boot_dir/initrd.ofs

# Create initrd.siz (note: 32 bit, stored in big endian).
read initrd_size x < <(du -b $boot_dir/initrd)
Expand All @@ -106,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.off $initrd_ofs_ofs
initrd.ofs $initrd_ofs_ofs
initrd.siz $initrd_siz_ofs
initrd $initrd_ofs
parmfile $parmfile_ofs
Expand All @@ -116,7 +118,7 @@ XXX
cat >$dst/suse.ins <<XXX
* SUSE Linux for IBM z Systems Installation System
boot/s390x/linux 0x00000000
boot/s390x/initrd.off $initrd_ofs_ofs
boot/s390x/initrd.ofs $initrd_ofs_ofs
boot/s390x/initrd.siz $initrd_siz_ofs
boot/s390x/initrd $initrd_ofs
boot/s390x/parmfile $parmfile_ofs
Expand All @@ -126,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.off $initrd_ofs_ofs
boot/s390x/initrd.ofs $initrd_ofs_ofs
boot/s390x/initrd.siz $initrd_siz_ofs
boot/s390x/initrd $initrd_ofs
boot/s390x/parmfile.hmc $parmfile_ofs
Expand Down Expand Up @@ -156,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.off 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_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
Expand Down
2 changes: 2 additions & 0 deletions live/config-cdroot/fix_bootconfig.x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
# https://github.com/openSUSE/agama/issues/1609
# KIWI config

set -e

dst="$1"

if [ ! -d "$dst" ] ; then
Expand Down
11 changes: 11 additions & 0 deletions live/src/agama-installer.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Feb 3 23:08:34 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>

- live: fix_bootconfig.s390x: use initrd.ofs for the initrd
offset filename (gh#agama-project/agama#1969)

-------------------------------------------------------------------
Mon Feb 3 23:01:37 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>

- fix_bootimage: exit on failures (gh#agama-project/agama#1969)

-------------------------------------------------------------------
Mon Jan 20 10:37:43 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

Expand Down