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

[bcbc]

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.

[Dimitri John Ledkov (xnox)]

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

[Dimitri John Ledkov (xnox)]

review: Approve

=== modified file 'data/isolist.ini'
--- data/isolist.ini	2012-11-16 14:31:12 +0000
+++ data/isolist.ini	2013-04-06 05:01:21 +0000
@@ -23,8 +23,8 @@
 metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-desktop-i386.metalink
 #metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-beta-desktop-i386.metalink
 metalink2=http://cdimage.ubuntu.com/daily-live/current/raring-desktop-i386.metalink
-diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-i386.tar.xz
-diskimage2=http://cdimage.ubuntu.com/wubi/current/i386.tar.xz
+#diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-i386.tar.xz
+#diskimage2=http://cdimage.ubuntu.com/wubi/current/i386.tar.xz
 website=http://www.ubuntu.com
 ordering=1
 
@@ -32,11 +32,12 @@
 arch=amd64
 name=Ubuntu
 packages=ubuntu-desktop
+kernel=casper/vmlinuz.efi
 metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-desktop-amd64.metalink
 #metalink=http://releases.ubuntu.com/13.04/ubuntu-13.04-beta-desktop-amd64.metalink
 metalink2=http://cdimage.ubuntu.com/daily-live/current/raring-desktop-amd64.metalink
-diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-amd64.tar.xz
-diskimage2=http://cdimage.ubuntu.com/wubi/current/amd64.tar.xz
+#diskimage=http://releases.ubuntu.com/13.04/ubuntu-13.04-wubi-amd64.tar.xz
+#diskimage2=http://cdimage.ubuntu.com/wubi/current/amd64.tar.xz
 website=http://www.ubuntu.com
 ordering=1
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-11-19 09:34:25 +0000
+++ debian/changelog	2013-04-06 05:01:21 +0000
@@ -1,5 +1,8 @@
 wubi (13.04) UNRELEASED; urgency=low
-
+  [ bcbc ]
+  * Use vmlinuz.efi kernel on the amd64 Ubuntu ISO (LP: #1134770)
+  * Suppress use of disk images (LP: #1155704)
+  
   [ Howard Chan ]
   * Added Ubuntu Studio option into Wubi (LP: #1070682)
   * Changed code in /src/wubi/backends/common/distro.py to make Wubi not