1 |
cjw |
133115 |
diff -up virtinst-0.600.0/man/en/virt-install.1.mageia virtinst-0.600.0/man/en/virt-install.1 |
2 |
|
|
--- virtinst-0.600.0/man/en/virt-install.1.mageia 2011-07-27 02:47:50.000000000 +0200 |
3 |
|
|
+++ virtinst-0.600.0/man/en/virt-install.1 2011-08-14 16:40:04.069049403 +0200 |
4 |
|
|
@@ -425,6 +425,10 @@ Values for some recent \s-1OS\s0 options |
5 |
|
|
.IX Item "fedora15 : Fedora 15" |
6 |
|
|
.IP "fedora14 : Fedora 14" 2 |
7 |
|
|
.IX Item "fedora14 : Fedora 14" |
8 |
|
|
+.IP "mageia2 : Mageia 2" 2 |
9 |
|
|
+.IX Item "mageia2 : Mageia 2" |
10 |
|
|
+.IP "mageia1 : Mageia 1" 2 |
11 |
|
|
+.IX Item "mageia1 : Mageia 1" |
12 |
|
|
.IP "mes5.1 : Mandriva Enterprise Server 5.1 and later" 2 |
13 |
|
|
.IX Item "mes5.1 : Mandriva Enterprise Server 5.1 and later" |
14 |
|
|
.IP "mandriva2010 : Mandriva Linux 2010 and later" 2 |
15 |
|
|
diff -up virtinst-0.600.0/man/en/virt-install.pod.in.mageia virtinst-0.600.0/man/en/virt-install.pod.in |
16 |
|
|
--- virtinst-0.600.0/man/en/virt-install.pod.in.mageia 2011-07-26 02:51:53.000000000 +0200 |
17 |
|
|
+++ virtinst-0.600.0/man/en/virt-install.pod.in 2011-08-14 16:13:31.765024946 +0200 |
18 |
|
|
@@ -250,6 +250,10 @@ http://download.opensuse.org/distributio |
19 |
dmorgan |
90044 |
|
20 |
cjw |
133115 |
ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2009.0/i586/ |
21 |
dmorgan |
90044 |
|
22 |
cjw |
133115 |
+=item Mageia |
23 |
dmorgan |
90044 |
+ |
24 |
cjw |
133115 |
+ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/i586/ |
25 |
dmorgan |
90044 |
+ |
26 |
cjw |
133115 |
=back |
27 |
dmorgan |
90044 |
|
28 |
cjw |
133115 |
=item --pxe |
29 |
|
|
diff -up virtinst-0.600.0/man/en/virt-install.pod.mageia virtinst-0.600.0/man/en/virt-install.pod |
30 |
|
|
--- virtinst-0.600.0/man/en/virt-install.pod.mageia 2011-07-27 02:47:50.000000000 +0200 |
31 |
|
|
+++ virtinst-0.600.0/man/en/virt-install.pod 2011-08-14 16:40:55.339793567 +0200 |
32 |
|
|
@@ -350,6 +350,10 @@ Values for some recent OS options are: |
33 |
dmorgan |
90044 |
|
34 |
cjw |
133115 |
=item fedora14 : Fedora 14 |
35 |
dmorgan |
90044 |
|
36 |
cjw |
133115 |
+=item mageia2 : Mageia 2 |
37 |
dmorgan |
90044 |
+ |
38 |
cjw |
133115 |
+=item mageia1 : Mageia 1 |
39 |
dmorgan |
90044 |
+ |
40 |
cjw |
133115 |
=item mes5.1 : Mandriva Enterprise Server 5.1 and later |
41 |
dmorgan |
90044 |
|
42 |
cjw |
133115 |
=item mandriva2010 : Mandriva Linux 2010 and later |
43 |
|
|
diff -up virtinst-0.600.0/virtinst/osdict.py.mageia virtinst-0.600.0/virtinst/osdict.py |
44 |
|
|
--- virtinst-0.600.0/virtinst/osdict.py.mageia 2011-07-27 01:39:19.000000000 +0200 |
45 |
|
|
+++ virtinst-0.600.0/virtinst/osdict.py 2011-08-14 16:37:09.597322862 +0200 |
46 |
|
|
@@ -379,6 +379,27 @@ OS_TYPES = { |
47 |
|
|
}, |
48 |
|
|
}, |
49 |
|
|
|
50 |
|
|
+ "mageia1": { |
51 |
|
|
+ "label": "Mageia 1", |
52 |
|
|
+ "distro": "mageia", |
53 |
|
|
+ "supported": True, |
54 |
|
|
+ "devices" : { |
55 |
|
|
+ DISK : VIRTIO_DISK, |
56 |
|
|
+ NET : VIRTIO_NET, |
57 |
|
|
+ INPUT: USB_TABLET, |
58 |
|
|
+ } |
59 |
|
|
+ }, |
60 |
|
|
+ "mageia2": { |
61 |
|
|
+ "label": "Mageia 2", |
62 |
|
|
+ "distro": "mageia", |
63 |
|
|
+ "supported": True, |
64 |
|
|
+ "devices" : { |
65 |
|
|
+ DISK : VIRTIO_DISK, |
66 |
|
|
+ NET : VIRTIO_NET, |
67 |
|
|
+ INPUT: USB_TABLET, |
68 |
|
|
+ } |
69 |
|
|
+ }, |
70 |
|
|
+ |
71 |
|
|
"mandriva2009": { |
72 |
|
|
"label": "Mandriva Linux 2009 and earlier", |
73 |
|
|
"distro": "mandriva" |
74 |
|
|
diff -up virtinst-0.600.0/virtinst/OSDistro.py.mageia virtinst-0.600.0/virtinst/OSDistro.py |
75 |
|
|
--- virtinst-0.600.0/virtinst/OSDistro.py.mageia 2011-07-25 13:47:11.000000000 +0200 |
76 |
|
|
+++ virtinst-0.600.0/virtinst/OSDistro.py 2011-08-14 16:13:31.768024873 +0200 |
77 |
|
|
@@ -89,6 +89,8 @@ def _storeForDistro(fetcher, baseuri, ty |
78 |
dmorgan |
93510 |
stores.append(UbuntuDistro) |
79 |
|
|
if distro == "mandriva" or distro is None: |
80 |
|
|
stores.append(MandrivaDistro) |
81 |
|
|
+ if distro == "mageia" or distro is None: |
82 |
|
|
+ stores.append(MageiaDistro) |
83 |
|
|
# XXX: this is really "nevada" |
84 |
|
|
if distro == "solaris" or distro is None: |
85 |
|
|
stores.append(SolarisDistro) |
86 |
cjw |
133115 |
@@ -997,6 +999,40 @@ class MandrivaDistro(Distro): |
87 |
dmorgan |
93510 |
|
88 |
|
|
return False |
89 |
|
|
|
90 |
|
|
+class MageiaDistro(Distro): |
91 |
|
|
+ |
92 |
|
|
+ name = "Mageia" |
93 |
|
|
+ os_type = "linux" |
94 |
|
|
+ _boot_iso_paths = [ "install/images/boot.iso" ] |
95 |
|
|
+ _hvm_kernel_paths = [ ("isolinux/alt0/vmlinuz", "isolinux/alt0/all.rdz")] |
96 |
|
|
+ _xen_kernel_paths = [] |
97 |
|
|
+ |
98 |
|
|
+ def isValidStore(self, fetcher, progresscb): |
99 |
|
|
+ # Don't support any paravirt installs |
100 |
|
|
+ if self.type is not None and self.type != "hvm": |
101 |
|
|
+ return False |
102 |
|
|
+ |
103 |
|
|
+ if not fetcher.hasFile("VERSION"): |
104 |
|
|
+ return False |
105 |
|
|
+ |
106 |
cjw |
95063 |
+ result = False |
107 |
|
|
+ versionfile = fetcher.acquireFile("VERSION", progresscb) |
108 |
|
|
+ try: |
109 |
|
|
+ f = open(versionfile, "r") |
110 |
|
|
+ try: |
111 |
|
|
+ buf = f.readline() |
112 |
|
|
+ if buf and re.match(".*Mageia.*", buf): |
113 |
|
|
+ result = True |
114 |
|
|
+ self.os_variant = "mageia" + re.sub(r'Mageia ([0-9.]+) .*\n', r'\1', buf) |
115 |
|
|
+ logging.debug("Detected a Mageia distro " + self.os_variant) |
116 |
|
|
+ finally: |
117 |
|
|
+ f.close() |
118 |
|
|
+ finally: |
119 |
|
|
+ if versionfile is not None: |
120 |
|
|
+ os.unlink(versionfile) |
121 |
dmorgan |
93510 |
+ |
122 |
cjw |
95063 |
+ return result |
123 |
|
|
+ |
124 |
dmorgan |
93510 |
# Solaris and OpenSolaris distros |
125 |
|
|
class SunDistro(Distro): |
126 |
|
|
|