debian-cd

Merge lp:~xnox/debian-cd/s390-fix-up-cdrom-boot into lp:~ubuntu-cdimage/debian-cd/ubun3

  1. s390-fix-up-cdrom-boot
  2. Merge into ubun3
Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Adam Conrad
Approved revision: 2007
Merged at revision: 2007
Proposed branch: lp:~xnox/debian-cd/s390-fix-up-cdrom-boot
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 13 lines (+2/-1)
1 file modified
tools/boot/disco/boot-s390x (+2/-1)
To merge this branch: bzr merge lp:~xnox/debian-cd/s390-fix-up-cdrom-boot
Reviewer Review Type Date Requested Status
Adam Conrad (community) Approve
Review via email: mp+359950@code.launchpad.net

Commit message

server-live: fixup s390x iso boot

Specify boot=casper cmdline in the paramfile, as otherwise no casper setup is done.

Fix initrd.siz calculation to actually contain the size of the initrd, rather than the size of the kernel image.

Tested image building with a local deployment of ubuntu-cdimage/debian-cd and tested "iso-like" ipl by using ftp load with the fixed up resulting boot/* products.

To post a comment you must log in.
Revision history for this message
Adam Conrad (adconrad) wrote :

Approved and merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/disco/boot-s390x'
2--- tools/boot/disco/boot-s390x 2018-11-12 18:08:58 +0000
3+++ tools/boot/disco/boot-s390x 2018-11-30 19:07:21 +0000
4@@ -58,7 +58,8 @@
5 CMDLINE="boot=casper --- quiet"
6 mv $CDDIR/casper/filesystem.initrd-generic $imagedir/initrd.ubuntu
7 mv $CDDIR/casper/filesystem.kernel-generic $imagedir/kernel.ubuntu
8- perl -e "print pack('N', -s '$imagedir/kernel.ubuntu')" > $imagedir/initrd.siz
9+ echo "$CMDLINE" > $imagedir/parmfile.ubuntu
10+ perl -e "print pack('N', -s '$imagedir/initrd.ubuntu')" > $imagedir/initrd.siz
11 else
12 CMDLINE="''"
13 fi

Subscribers

People subscribed via source and target branches