|
 |
5cb6719 |
changeset: 406:5f10c7c171af
|
|
|
5cb6719 |
user: "Daniel P. Berrange <berrange@redhat.com>"
|
|
|
5cb6719 |
date: Mon Apr 21 18:05:55 2008 -0400
|
|
|
5cb6719 |
files: virtinst/OSDistro.py
|
|
|
5cb6719 |
description:
|
|
|
5cb6719 |
Fix fetching of hvm kernel/initrds
|
|
|
5cb6719 |
|
|
|
5cb6719 |
|
|
|
5cb6719 |
diff -r 6462dfd3e606 -r 5f10c7c171af virtinst/OSDistro.py
|
|
|
5cb6719 |
--- a/virtinst/OSDistro.py Tue Apr 08 15:35:49 2008 -0400
|
|
|
5cb6719 |
+++ b/virtinst/OSDistro.py Mon Apr 21 18:05:55 2008 -0400
|
|
|
5cb6719 |
@@ -79,7 +79,7 @@
|
|
|
5cb6719 |
initrdpath = self.treeinfo.get("images-%s" % type, "initrd")
|
|
|
5cb6719 |
else:
|
|
|
5cb6719 |
# fall back to old code
|
|
|
5cb6719 |
- if self.type is None:
|
|
|
5cb6719 |
+ if self.type is None or self.type == "hvm":
|
|
|
5cb6719 |
kernelpath = "images/pxeboot/vmlinuz"
|
|
|
5cb6719 |
initrdpath = "images/pxeboot/initrd.img"
|
|
|
5cb6719 |
else:
|
|
|
5cb6719 |
@@ -359,7 +359,7 @@
|
|
|
5cb6719 |
class DebianDistro(Distro):
|
|
|
5cb6719 |
def isValidStore(self, fetcher, progresscb):
|
|
|
5cb6719 |
# Don't support any paravirt installs
|
|
|
5cb6719 |
- if self.type is not None:
|
|
|
5cb6719 |
+ if self.type is not None and self.type != "hvm":
|
|
|
5cb6719 |
return False
|
|
|
5cb6719 |
|
|
|
5cb6719 |
file = None
|
|
|
5cb6719 |
@@ -400,21 +400,21 @@
|
|
|
5cb6719 |
class UbuntuDistro(Distro):
|
|
|
5cb6719 |
def isValidStore(self, fetcher, progresscb):
|
|
|
5cb6719 |
# Don't support any paravirt installs
|
|
|
5cb6719 |
- if self.type is not None:
|
|
|
5cb6719 |
+ if self.type is not None and self.type != "hvm":
|
|
|
5cb6719 |
return False
|
|
|
5cb6719 |
return False
|
|
|
5cb6719 |
|
|
|
5cb6719 |
class GentooDistro(Distro):
|
|
|
5cb6719 |
def isValidStore(self, fetcher, progresscb):
|
|
|
5cb6719 |
# Don't support any paravirt installs
|
|
|
5cb6719 |
- if self.type is not None:
|
|
|
5cb6719 |
+ if self.type is not None and self.type != "hvm":
|
|
|
5cb6719 |
return False
|
|
|
5cb6719 |
return False
|
|
|
5cb6719 |
|
|
|
5cb6719 |
class MandrivaDistro(Distro):
|
|
|
5cb6719 |
def isValidStore(self, fetcher, progresscb):
|
|
|
5cb6719 |
# Don't support any paravirt installs
|
|
|
5cb6719 |
- if self.type is not None:
|
|
|
5cb6719 |
+ if self.type is not None and self.type != "hvm":
|
|
|
5cb6719 |
return False
|
|
|
5cb6719 |
|
|
|
5cb6719 |
# Mandriva websites / media appear to have a VERSION
|
|
|
5cb6719 |
|