| 1 |
cjw |
95063 |
diff -ru virtinst-0.500.6.orig/man/en/virt-install.1 virtinst-0.500.6/man/en/virt-install.1 |
| 2 |
|
|
--- virtinst-0.500.6.orig/man/en/virt-install.1 2011-03-24 21:31:45.000000000 +0100 |
| 3 |
|
|
+++ virtinst-0.500.6/man/en/virt-install.1 2011-05-04 23:04:08.760132461 +0200 |
| 4 |
dmorgan |
90044 |
@@ -511,6 +511,9 @@ |
| 5 |
|
|
.IP "mandriva2009" 4 |
| 6 |
|
|
.IX Item "mandriva2009" |
| 7 |
|
|
Mandriva Linux 2009 and earlier |
| 8 |
|
|
+.IP "mageia1" 4 |
| 9 |
|
|
+.IX Item "mageia1" |
| 10 |
cjw |
95063 |
+Mageia 1 |
| 11 |
dmorgan |
90044 |
.IP "rhel6" 4 |
| 12 |
|
|
.IX Item "rhel6" |
| 13 |
|
|
Red Hat Enterprise Linux 6 |
| 14 |
cjw |
95063 |
diff -ru virtinst-0.500.6.orig/man/en/virt-install.pod virtinst-0.500.6/man/en/virt-install.pod |
| 15 |
|
|
--- virtinst-0.500.6.orig/man/en/virt-install.pod 2011-03-24 21:31:44.000000000 +0100 |
| 16 |
|
|
+++ virtinst-0.500.6/man/en/virt-install.pod 2011-05-04 23:04:08.813131832 +0200 |
| 17 |
dmorgan |
90044 |
@@ -465,6 +465,10 @@ |
| 18 |
|
|
|
| 19 |
|
|
Mandriva Linux 2009 and earlier |
| 20 |
|
|
|
| 21 |
|
|
+=item mageia1 |
| 22 |
|
|
+ |
| 23 |
cjw |
95063 |
+Mageia 1 |
| 24 |
dmorgan |
90044 |
+ |
| 25 |
|
|
=item rhel6 |
| 26 |
|
|
|
| 27 |
|
|
Red Hat Enterprise Linux 6 |
| 28 |
cjw |
95063 |
diff -ru virtinst-0.500.6.orig/man/en/virt-install.pod.in virtinst-0.500.6/man/en/virt-install.pod.in |
| 29 |
|
|
--- virtinst-0.500.6.orig/man/en/virt-install.pod.in 2011-03-24 21:30:40.000000000 +0100 |
| 30 |
|
|
+++ virtinst-0.500.6/man/en/virt-install.pod.in 2011-05-04 23:04:08.846131440 +0200 |
| 31 |
dmorgan |
90044 |
@@ -228,6 +228,10 @@ |
| 32 |
|
|
|
| 33 |
|
|
ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2009.0/i586/ |
| 34 |
|
|
|
| 35 |
|
|
+=item Mageia |
| 36 |
|
|
+ |
| 37 |
|
|
+ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/i586/ |
| 38 |
|
|
+ |
| 39 |
|
|
=back |
| 40 |
|
|
|
| 41 |
|
|
=item --pxe |
| 42 |
cjw |
95063 |
diff -ru virtinst-0.500.6.orig/virtinst/osdict.py virtinst-0.500.6/virtinst/osdict.py |
| 43 |
|
|
--- virtinst-0.500.6.orig/virtinst/osdict.py 2011-03-24 21:30:40.000000000 +0100 |
| 44 |
|
|
+++ virtinst-0.500.6/virtinst/osdict.py 2011-05-05 13:38:11.496814193 +0200 |
| 45 |
|
|
@@ -311,7 +311,6 @@ |
| 46 |
|
|
NET : VIRTIO_NET, |
| 47 |
|
|
}, |
| 48 |
|
|
}, |
| 49 |
|
|
- |
| 50 |
|
|
"mandriva2009": { "label": "Mandriva Linux 2009 and earlier", |
| 51 |
|
|
"distro": "mandriva" }, |
| 52 |
|
|
"mandriva2010": { "label": "Mandriva Linux 2010 and later", |
| 53 |
|
|
@@ -321,7 +320,12 @@ |
| 54 |
|
|
NET : VIRTIO_NET, |
| 55 |
|
|
}, |
| 56 |
|
|
}, |
| 57 |
|
|
- |
| 58 |
|
|
+ "mageia1": { "label": "Mageia 1", "distro": "mageia", |
| 59 |
|
|
+ "devices" : { |
| 60 |
|
|
+ DISK : VIRTIO_DISK, |
| 61 |
|
|
+ NET : VIRTIO_NET, |
| 62 |
|
|
+ INPUT: USB_TABLET, |
| 63 |
|
|
+ }}, |
| 64 |
|
|
"mes5": { "label": "Mandriva Enterprise Server 5.0", |
| 65 |
|
|
"distro": "mandriva" }, |
| 66 |
|
|
"mes5.1": { "label": "Mandriva Enterprise Server 5.1 and later", |
| 67 |
|
|
diff -ru virtinst-0.500.6.orig/virtinst/OSDistro.py virtinst-0.500.6/virtinst/OSDistro.py |
| 68 |
|
|
--- virtinst-0.500.6.orig/virtinst/OSDistro.py 2011-03-24 21:30:40.000000000 +0100 |
| 69 |
|
|
+++ virtinst-0.500.6/virtinst/OSDistro.py 2011-05-05 13:41:04.783829761 +0200 |
| 70 |
dmorgan |
93510 |
@@ -89,6 +89,8 @@ |
| 71 |
|
|
stores.append(UbuntuDistro) |
| 72 |
|
|
if distro == "mandriva" or distro is None: |
| 73 |
|
|
stores.append(MandrivaDistro) |
| 74 |
|
|
+ if distro == "mageia" or distro is None: |
| 75 |
|
|
+ stores.append(MageiaDistro) |
| 76 |
|
|
# XXX: this is really "nevada" |
| 77 |
|
|
if distro == "solaris" or distro is None: |
| 78 |
|
|
stores.append(SolarisDistro) |
| 79 |
cjw |
95063 |
@@ -997,6 +999,40 @@ |
| 80 |
dmorgan |
93510 |
|
| 81 |
|
|
return False |
| 82 |
|
|
|
| 83 |
|
|
+class MageiaDistro(Distro): |
| 84 |
|
|
+ |
| 85 |
|
|
+ name = "Mageia" |
| 86 |
|
|
+ os_type = "linux" |
| 87 |
|
|
+ _boot_iso_paths = [ "install/images/boot.iso" ] |
| 88 |
|
|
+ _hvm_kernel_paths = [ ("isolinux/alt0/vmlinuz", "isolinux/alt0/all.rdz")] |
| 89 |
|
|
+ _xen_kernel_paths = [] |
| 90 |
|
|
+ |
| 91 |
|
|
+ def isValidStore(self, fetcher, progresscb): |
| 92 |
|
|
+ # Don't support any paravirt installs |
| 93 |
|
|
+ if self.type is not None and self.type != "hvm": |
| 94 |
|
|
+ return False |
| 95 |
|
|
+ |
| 96 |
|
|
+ if not fetcher.hasFile("VERSION"): |
| 97 |
|
|
+ return False |
| 98 |
|
|
+ |
| 99 |
cjw |
95063 |
+ result = False |
| 100 |
|
|
+ versionfile = fetcher.acquireFile("VERSION", progresscb) |
| 101 |
|
|
+ try: |
| 102 |
|
|
+ f = open(versionfile, "r") |
| 103 |
|
|
+ try: |
| 104 |
|
|
+ buf = f.readline() |
| 105 |
|
|
+ if buf and re.match(".*Mageia.*", buf): |
| 106 |
|
|
+ result = True |
| 107 |
|
|
+ self.os_variant = "mageia" + re.sub(r'Mageia ([0-9.]+) .*\n', r'\1', buf) |
| 108 |
|
|
+ logging.debug("Detected a Mageia distro " + self.os_variant) |
| 109 |
|
|
+ finally: |
| 110 |
|
|
+ f.close() |
| 111 |
|
|
+ finally: |
| 112 |
|
|
+ if versionfile is not None: |
| 113 |
|
|
+ os.unlink(versionfile) |
| 114 |
dmorgan |
93510 |
+ |
| 115 |
cjw |
95063 |
+ return result |
| 116 |
|
|
+ |
| 117 |
dmorgan |
93510 |
# Solaris and OpenSolaris distros |
| 118 |
|
|
class SunDistro(Distro): |
| 119 |
|
|
|
Parent Directory
| 
Revision Log