Merge lp:~xnox/debian-cd/unbreak-s390x into lp:~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2104
Proposed branch: lp:~xnox/debian-cd/unbreak-s390x
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
tools/boot/hirsute/boot-s390x (+1/-1)
To merge this branch: bzr merge lp:~xnox/debian-cd/unbreak-s390x
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email:

Commit message

Unbreak s390x

To post a comment you must log in.
lp:~xnox/debian-cd/unbreak-s390x updated
2104. By Dimitri John Ledkov

Fixup cleanup branch.

$CMDLINE variable is gone, use the contents of the param file.

Revision history for this message
Iain Lane (laney) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/hirsute/boot-s390x'
2--- tools/boot/hirsute/boot-s390x 2020-12-11 12:09:59 +0000
3+++ tools/boot/hirsute/boot-s390x 2021-01-08 13:58:36 +0000
4@@ -49,7 +49,7 @@
5 sed -e 's,^[^*],boot/&,g' < $CDDIR/boot/ubuntu.ins > $CDDIR/ubuntu.ins
7 # generate QEMU-KVM boot image
8-$BASEDIR/tools/ --initrd=$CDDIR/boot/initrd.ubuntu --kernel=$CDDIR/boot/kernel.ubuntu --cmdline="$CMDLINE" --outfile=$CDDIR/boot/ubuntu.ikr
9+$BASEDIR/tools/ --initrd=$CDDIR/boot/initrd.ubuntu --kernel=$CDDIR/boot/kernel.ubuntu --cmdline="$(cat $CDDIR/boot/parmfile.ubuntu)" --outfile=$CDDIR/boot/ubuntu.ikr
11 # enable Joliet and add QEMU-KVM boot image
12 echo -n " -J -no-emul-boot -b boot/ubuntu.ikr" >> $N.mkisofs_opts


People subscribed via source and target branches