Merge lp://staging/~xnox/debian-cd/s390-fix-up-cdrom-boot into lp://staging/~ubuntu-cdimage/debian-cd/ubun3
Proposed by
Dimitri John Ledkov
| Status: | Merged |
|---|---|
| Approved by: | Adam Conrad |
| Approved revision: | 2007 |
| Merged at revision: | 2007 |
| Proposed branch: | lp://staging/~xnox/debian-cd/s390-fix-up-cdrom-boot |
| Merge into: | lp://staging/~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://staging/~xnox/debian-cd/s390-fix-up-cdrom-boot |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Adam Conrad (community) | Approve | ||
|
Review via email:
|
|||
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-
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
Approved and merged.