Merge lp:~bcbc/wubi/lp1134770-1155704 into lp:wubi

Proposed by bcbc on 2013-04-06
Status: Merged
Merged at revision: 279
Proposed branch: lp:~bcbc/wubi/lp1134770-1155704
Merge into: lp:wubi
Diff against target: 43 lines (+9/-5)
2 files modified
data/isolist.ini (+5/-4)
debian/changelog (+4/-1)
To merge this branch: bzr merge lp:~bcbc/wubi/lp1134770-1155704
Reviewer Review Type Date Requested Status
Dimitri John Ledkov 2013-04-06 Approve on 2013-04-17
Review via email: mp+157506@code.launchpad.net

Description of the Change

This patch modifies the data/isolist.ini to address two bugs.

The first bug 1134770 is that the kernel on the amd64 has changed from vmlinuz to vmlinuz.efi.

The second bug 1155704 is that the disk image used for Wubi installs is broken. The patch provides a workaround to this bug by disabling the diskimage installs and reverts to downloading the ISO instead.

I've installed using the patched wubi.exe run standalone (no ISO available) to show that it now goes after the ISO and also that it recognizes the correct kernel. The download and installation were successful and rebooting into Ubuntu completed normally.

To post a comment you must log in.
Dimitri John Ledkov (xnox) wrote :

looks good. instead of commenting out, removed the diskimage stanzas completely.

Dimitri John Ledkov (xnox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/isolist.ini'
2--- data/isolist.ini 2012-11-16 14:31:12 +0000
3+++ data/isolist.ini 2013-04-06 05:01:21 +0000
4@@ -23,8 +23,8 @@
5 metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-desktop-i386.metalink
6 #metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-beta-desktop-i386.metalink
7 metalink2=http://cdimage.ubuntu.com/daily-live/current/raring-desktop-i386.metalink
8-diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-i386.tar.xz
9-diskimage2=http://cdimage.ubuntu.com/wubi/current/i386.tar.xz
10+#diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-i386.tar.xz
11+#diskimage2=http://cdimage.ubuntu.com/wubi/current/i386.tar.xz
12 website=http://www.ubuntu.com
13 ordering=1
14
15@@ -32,11 +32,12 @@
16 arch=amd64
17 name=Ubuntu
18 packages=ubuntu-desktop
19+kernel=casper/vmlinuz.efi
20 metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-desktop-amd64.metalink
21 #metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-beta-desktop-amd64.metalink
22 metalink2=http://cdimage.ubuntu.com/daily-live/current/raring-desktop-amd64.metalink
23-diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-amd64.tar.xz
24-diskimage2=http://cdimage.ubuntu.com/wubi/current/amd64.tar.xz
25+#diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-amd64.tar.xz
26+#diskimage2=http://cdimage.ubuntu.com/wubi/current/amd64.tar.xz
27 website=http://www.ubuntu.com
28 ordering=1
29
30
31=== modified file 'debian/changelog'
32--- debian/changelog 2012-11-19 09:34:25 +0000
33+++ debian/changelog 2013-04-06 05:01:21 +0000
34@@ -1,5 +1,8 @@
35 wubi (13.04) UNRELEASED; urgency=low
36-
37+ [ bcbc ]
38+ * Use vmlinuz.efi kernel on the amd64 Ubuntu ISO (LP: #1134770)
39+ * Suppress use of disk images (LP: #1155704)
40+
41 [ Howard Chan ]
42 * Added Ubuntu Studio option into Wubi (LP: #1070682)
43 * Changed code in /src/wubi/backends/common/distro.py to make Wubi not

Subscribers

People subscribed via source and target branches

to status/vote changes: