diff -Nru virtinst-0.500.5/debian/changelog virtinst-0.500.5/debian/changelog --- virtinst-0.500.5/debian/changelog 2011-04-05 21:51:23.000000000 +0000 +++ virtinst-0.500.5/debian/changelog 2011-04-27 23:21:53.000000000 +0000 @@ -1,8 +1,26 @@ -virtinst (0.500.5-1ubuntu3~ppa1) natty; urgency=low +virtinst (0.500.5-1ubuntu5~ppa1) natty; urgency=low + + * debian/patches: + - 9005_ubuntu_fix_arch_when_mirror_is_iso.patch: Fix determination of + the tree arch. + - 9006_ubuntu_mini_iso_tree_support.patch: Add detection support when + tree is a Ubuntu mini ISO. + + -- Andres Rodriguez Wed, 27 Apr 2011 19:21:51 -0400 + +virtinst (0.500.5-1ubuntu4) natty; urgency=low + + * debian/patches/9004_ubuntu_correct_tree.patch: Updated to consider that + HTTP source can be both, a mounted ISO (or cobbler imported ISO) or a + netbook HTTP source. (LP: #751979) + + -- Andres Rodriguez Fri, 08 Apr 2011 14:14:51 -0400 + +virtinst (0.500.5-1ubuntu3) natty; urgency=low * Correctly detect an UbuntuDistro from an HTTP source. (LP: #751979) - -- Andres Rodriguez Tue, 05 Apr 2011 17:51:14 -0400 + -- Andres Rodriguez Tue, 05 Apr 2011 18:18:09 -0400 virtinst (0.500.5-1ubuntu2) natty; urgency=low diff -Nru virtinst-0.500.5/debian/patches/9004_ubuntu_correct_tree.patch virtinst-0.500.5/debian/patches/9004_ubuntu_correct_tree.patch --- virtinst-0.500.5/debian/patches/9004_ubuntu_correct_tree.patch 2011-04-05 21:51:01.000000000 +0000 +++ virtinst-0.500.5/debian/patches/9004_ubuntu_correct_tree.patch 2011-04-11 13:48:32.000000000 +0000 @@ -1,36 +1,37 @@ Description: Correctly detect UbuntuDistro in HTTP source - When the installation source is an HTTP source (or FTP in such case), the UbuntDistro - is not correctly detected causing the installation to fail by not detecting the it - as an Ubuntu source. + When the installation source is a mounted ISO (or even cobbler imported ISO) on a + HTTP source (or FTP in such case), the UbuntDistro is not correctly detected + causing the installation to fail by not detecting the it as an Ubuntu source. This patch fixes the approach to determine whether the source is an Ubuntu source. Author: Andres Rodriguez Bug-Ubuntu: https://bugs.launchpad.net/bugs/751979 Index: virtinst-0.500.5/virtinst/OSDistro.py =================================================================== ---- virtinst-0.500.5.orig/virtinst/OSDistro.py 2011-04-05 17:17:21.460319945 -0400 -+++ virtinst-0.500.5/virtinst/OSDistro.py 2011-04-05 17:17:56.040370663 -0400 -@@ -945,6 +945,7 @@ - - def _set_media_paths(self): - DebianDistro._set_media_paths(self) -+ self._prefix = "install" - root = "%s/netboot/ubuntu-installer/%s/" % (self._prefix, - self._treeArch) - self._hvm_kernel_paths = [ (root + "linux", root + "initrd.gz") ] -@@ -956,12 +957,12 @@ +--- virtinst-0.500.5.orig/virtinst/OSDistro.py 2011-04-08 13:32:09.386817994 -0400 ++++ virtinst-0.500.5/virtinst/OSDistro.py 2011-04-08 13:38:01.957335095 -0400 +@@ -956,12 +956,21 @@ return False # For regular trees - if not fetcher.hasFile("%s/MANIFEST" % self._prefix): -+ if not fetcher.hasFile("%s/netboot/version.info" % self._prefix): ++ if fetcher.hasFile("%s/MANIFEST" % self._prefix): ++ filename = "%s/MANIFEST" % self._prefix ++ regex = ".*ubuntu-installer.*" ++ elif fetcher.hasFile("install/netboot/version.info"): ++ self._prefix = "install" ++ self._set_media_paths() ++ filename = "%s/netboot/version.info" % self._prefix ++ regex = "Ubuntu*" ++ else: ++ logging.debug("Doesn't look like an Ubuntu Distro.") return False if self._fetchAndMatchRegex(fetcher, progresscb, - "%s/MANIFEST" % self._prefix, - ".*ubuntu-installer.*"): -+ "%s/netboot/version.info" % self._prefix, -+ "Ubuntu*"): ++ filename, ++ regex): logging.debug("Detected an Ubuntu distro") return True diff -Nru virtinst-0.500.5/debian/patches/9005_ubuntu_fix_arch_when_mirror_is_iso.patch virtinst-0.500.5/debian/patches/9005_ubuntu_fix_arch_when_mirror_is_iso.patch --- virtinst-0.500.5/debian/patches/9005_ubuntu_fix_arch_when_mirror_is_iso.patch 1970-01-01 00:00:00.000000000 +0000 +++ virtinst-0.500.5/debian/patches/9005_ubuntu_fix_arch_when_mirror_is_iso.patch 2011-04-27 23:18:38.000000000 +0000 @@ -0,0 +1,15 @@ +Index: virtinst-0.500.5/virtinst/OSDistro.py +=================================================================== +--- virtinst-0.500.5.orig/virtinst/OSDistro.py 2011-04-27 19:17:13.115714439 -0400 ++++ virtinst-0.500.5/virtinst/OSDistro.py 2011-04-27 19:18:32.535830923 -0400 +@@ -961,6 +961,10 @@ + regex = ".*ubuntu-installer.*" + elif fetcher.hasFile("install/netboot/version.info"): + self._prefix = "install" ++ if fetcher.hasFile("install/netboot/ubuntu-installer/i386"): ++ self._treeArch = "i386" ++ elif fetcher.hasFile("install/netboot/ubuntu-installer/amd64"): ++ self._treeArch = "amd64" + self._set_media_paths() + filename = "%s/netboot/version.info" % self._prefix + regex = "Ubuntu*" diff -Nru virtinst-0.500.5/debian/patches/9006_ubuntu_mini_iso_tree_support.patch virtinst-0.500.5/debian/patches/9006_ubuntu_mini_iso_tree_support.patch --- virtinst-0.500.5/debian/patches/9006_ubuntu_mini_iso_tree_support.patch 1970-01-01 00:00:00.000000000 +0000 +++ virtinst-0.500.5/debian/patches/9006_ubuntu_mini_iso_tree_support.patch 2011-04-27 23:20:08.000000000 +0000 @@ -0,0 +1,32 @@ +Index: virtinst-0.500.5/virtinst/OSDistro.py +=================================================================== +--- virtinst-0.500.5.orig/virtinst/OSDistro.py 2011-04-27 19:19:36.765925134 -0400 ++++ virtinst-0.500.5/virtinst/OSDistro.py 2011-04-27 19:20:03.615964510 -0400 +@@ -945,8 +945,11 @@ + + def _set_media_paths(self): + DebianDistro._set_media_paths(self) +- root = "%s/netboot/ubuntu-installer/%s/" % (self._prefix, +- self._treeArch) ++ if self._prefix: ++ root = "%s/netboot/ubuntu-installer/%s/" % (self._prefix, ++ self._treeArch) ++ else: ++ root = "" + self._hvm_kernel_paths = [ (root + "linux", root + "initrd.gz") ] + self._xen_kernel_paths = [] + +@@ -968,6 +971,13 @@ + self._set_media_paths() + filename = "%s/netboot/version.info" % self._prefix + regex = "Ubuntu*" ++ elif fetcher.hasFile("initrd.gz") and fetcher.hasFile("linux"): ++ self._prefix = "" ++ if fetcher.hasFile("boot/grub/x86_64-efi"): ++ self._treeArch = "amd64" ++ self._set_media_paths() ++ filename = "f10.txt" ++ regex = "Ubuntu*" + else: + logging.debug("Doesn't look like an Ubuntu Distro.") + return False diff -Nru virtinst-0.500.5/debian/patches/series virtinst-0.500.5/debian/patches/series --- virtinst-0.500.5/debian/patches/series 2011-04-05 21:46:37.000000000 +0000 +++ virtinst-0.500.5/debian/patches/series 2011-04-27 23:19:29.000000000 +0000 @@ -5,3 +5,5 @@ 9003-fix-path-to-hvmloader-in-testsuite.patch 9002_Lucid.patch 9004_ubuntu_correct_tree.patch +9005_ubuntu_fix_arch_when_mirror_is_iso.patch +9006_ubuntu_mini_iso_tree_support.patch