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

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1929
Proposed branch: lp:~xnox/debian-cd/s390x-bugfixes
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 32 lines (+10/-6)
1 file modified
tools/boot/xenial/boot-s390x (+10/-6)
To merge this branch: bzr merge lp:~xnox/debian-cd/s390x-bugfixes
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team Pending
Review via email: mp+284137@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/xenial/boot-s390x'
2--- tools/boot/xenial/boot-s390x 2016-01-25 12:55:25 +0000
3+++ tools/boot/xenial/boot-s390x 2016-01-27 15:01:30 +0000
4@@ -6,7 +6,7 @@
5 #
6 # (C) 2001 Jochen Röhrig <jr@debian.org>
7 # 2005 Frans Pop <fjp@debian.org>
8-# 2015 Dimitri John Ledkov <xnox@ubuntu.com> - changes for ubuntu
9+# 2015-2016 Dimitri John Ledkov <xnox@ubuntu.com> - changes for ubuntu
10 #
11 # Released under the GNU general Public License.
12 # See the copyright file for license details.
13@@ -63,10 +63,14 @@
14 # - README
15 cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir
16
17-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
18-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b"
19-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "boot/ubuntu.ikr"
20+# secondary top-level ubuntu.ins file was requested in
21+# https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/6
22+sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins
23+
24+# add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in
25+# "-no-emul-boot"
26+#
27+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot -b boot/ubuntu.ikr"
28
29 # Include the boot$N/-tree into the iso-image
30-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
31-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "boot$N"
32+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J boot$N"

Subscribers

People subscribed via source and target branches