From: "Daniel P. Berrange" <berrange@xxxxxxxxxx> The following distro names are used, all in lowercase for compatibility with libguestfs <distro>centos</distro> <distro>debian</distro> <distro>fedora</distro> <distro>freebsd</distro> <distro>mandrake</distro> <distro>mandriva</distro> <distro>mes</distro> <distro>msdos</distro> <distro>netbsd</distro> <distro>netware</distro> <distro>openbsd</distro> <distro>opensolaris</distro> <distro>opensuse</distro> <distro>osx</distro> <distro>rhel</distro> <distro>rhl</distro> <distro>sled</distro> <distro>sles</distro> <distro>solaris</distro> <distro>ubuntu</distro> <distro>windows</distro> --- data/oses/centos.xml | 2 ++ data/oses/debian.xml | 11 +++++++++++ data/oses/fedora.xml | 16 ++++++++++++++++ data/oses/freebsd.xml | 40 ++++++++++++++++++++++++++++++++++++++++ data/oses/macos.xml | 8 ++++++++ data/oses/mandrake.xml | 17 +++++++++++++++++ data/oses/mandriva.xml | 13 +++++++++++++ data/oses/netbsd.xml | 14 ++++++++++++++ data/oses/openbsd.xml | 7 +++++++ data/oses/opensuse.xml | 8 ++++++++ data/oses/others.xml | 4 ++++ data/oses/rhel.xml | 40 ++++++++++++++++++++++++++++++++++++++++ data/oses/rhl.xml | 20 ++++++++++++++++++++ data/oses/solaris.xml | 3 +++ data/oses/suse.xml | 6 ++++++ data/oses/ubuntu.xml | 15 +++++++++++++++ data/oses/windows.xml | 13 +++++++++++++ 17 files changed, 237 insertions(+), 0 deletions(-) diff --git a/data/oses/centos.xml b/data/oses/centos.xml index 452c53e..42c5753 100644 --- a/data/oses/centos.xml +++ b/data/oses/centos.xml @@ -6,6 +6,7 @@ <version>6.0</version> <vendor>CentOS</vendor> <family>Linux</family> + <distro>centos</distro> <clones id="http://redhat.com/rhel/6.0"/> <!-- there is no obvious difference between x86 and x86_64 isos, @@ -30,6 +31,7 @@ <version>6.1</version> <vendor>CentOS</vendor> <family>Linux</family> + <distro>centos</distro> <upgrades id="http://centos.org/centos/6.0"/> <clones id="http://redhat.com/rhel/6.1"/> </os> diff --git a/data/oses/debian.xml b/data/oses/debian.xml index 70aaafc..d25a3c0 100644 --- a/data/oses/debian.xml +++ b/data/oses/debian.xml @@ -6,6 +6,7 @@ <version>1.1</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> </os> <os id="http://debian.org/rex"> @@ -14,6 +15,7 @@ <version>1.2</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/buzz"/> <derives-from id="http://debian.org/buzz"/> </os> @@ -24,6 +26,7 @@ <version>1.3</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/rex"/> <derives-from id="http://debian.org/rex"/> </os> @@ -34,6 +37,7 @@ <version>2.0</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/bo"/> <derives-from id="http://debian.org/bo"/> </os> @@ -44,6 +48,7 @@ <version>2.1</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/hamm"/> <derives-from id="http://debian.org/hamm"/> </os> @@ -54,6 +59,7 @@ <version>2.2</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/silnk"/> <derives-from id="http://debian.org/silnk"/> </os> @@ -64,6 +70,7 @@ <version>3</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/potato"/> <derives-from id="http://debian.org/potato"/> </os> @@ -75,6 +82,7 @@ <version>3.1</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/woody"/> <derives-from id="http://debian.org/woody"/> </os> @@ -85,6 +93,7 @@ <version>4</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/sarge"/> <derives-from id="http://debian.org/sarge"/> </os> @@ -95,6 +104,7 @@ <version>5</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/etch"/> <derives-from id="http://debian.org/etch"/> @@ -124,6 +134,7 @@ <version>6</version> <vendor>Debian Project</vendor> <family>Linux</family> + <distro>debian</distro> <upgrades id="http://debian.org/lenny"/> <derives-from id="http://debian.org/lenny"/> diff --git a/data/oses/fedora.xml b/data/oses/fedora.xml index 841349c..79581bd 100644 --- a/data/oses/fedora.xml +++ b/data/oses/fedora.xml @@ -6,6 +6,7 @@ <version>1</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Yarrow</codename> <upgrades id="http://redhat.com/rhl/9"/> <derives-from id="http://redhat.com/rhl/9"/> @@ -59,6 +60,7 @@ <version>2</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Tettnang</codename> <upgrades id="http://fedoraproject.org/fedora/1"/> <derives-from id="http://fedoraproject.org/fedora/1"/> @@ -105,6 +107,7 @@ <version>3</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Heidelberg</codename> <upgrades id="http://fedoraproject.org/fedora/2"/> <derives-from id="http://fedoraproject.org/fedora/2"/> @@ -151,6 +154,7 @@ <version>4</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Stentz</codename> <upgrades id="http://fedoraproject.org/fedora/3"/> <derives-from id="http://fedoraproject.org/fedora/3"/> @@ -206,6 +210,7 @@ <version>5</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Bordeaux</codename> <upgrades id="http://fedoraproject.org/fedora/4"/> <derives-from id="http://fedoraproject.org/fedora/4"/> @@ -261,6 +266,7 @@ <version>6</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Zod</codename> <upgrades id="http://fedoraproject.org/fedora/5"/> <derives-from id="http://fedoraproject.org/fedora/5"/> @@ -316,6 +322,7 @@ <version>7</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Moonshine</codename> <upgrades id="http://fedoraproject.org/fedora/6"/> <derives-from id="http://fedoraproject.org/fedora/6"/> @@ -394,6 +401,7 @@ <version>8</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Werewolf</codename> <upgrades id="http://fedoraproject.org/fedora/7"/> <derives-from id="http://fedoraproject.org/fedora/7"/> @@ -481,6 +489,7 @@ <version>9</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Sulphur</codename> <upgrades id="http://fedoraproject.org/fedora/8"/> <derives-from id="http://fedoraproject.org/fedora/8"/> @@ -567,6 +576,7 @@ <version>10</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Cambridge</codename> <upgrades id="http://fedoraproject.org/fedora/9"/> <derives-from id="http://fedoraproject.org/fedora/9"/> @@ -650,6 +660,7 @@ <version>11</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Leonidas</codename> <upgrades id="http://fedoraproject.org/fedora/10"/> <derives-from id="http://fedoraproject.org/fedora/10"/> @@ -733,6 +744,7 @@ <version>12</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Constantine</codename> <upgrades id="http://fedoraproject.org/fedora/11"/> <derives-from id="http://fedoraproject.org/fedora/11"/> @@ -811,6 +823,7 @@ <version>13</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Goddard</codename> <upgrades id="http://fedoraproject.org/fedora/12"/> <derives-from id="http://fedoraproject.org/fedora/12"/> @@ -881,6 +894,7 @@ <version>14</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Laughlin</codename> <upgrades id="http://fedoraproject.org/fedora/13"/> <derives-from id="http://fedoraproject.org/fedora/13"/> @@ -964,6 +978,7 @@ <version>15</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Lovelock</codename> <upgrades id="http://fedoraproject.org/fedora/14"/> <derives-from id="http://fedoraproject.org/fedora/14"/> @@ -1046,6 +1061,7 @@ <version>16</version> <vendor>Fedora Project</vendor> <family>Linux</family> + <distro>fedora</distro> <codename>Verne</codename> <upgrades id="http://fedoraproject.org/fedora/15"/> <derives-from id="http://fedoraproject.org/fedora/15"/> diff --git a/data/oses/freebsd.xml b/data/oses/freebsd.xml index 905c5bd..78ffe23 100644 --- a/data/oses/freebsd.xml +++ b/data/oses/freebsd.xml @@ -6,6 +6,7 @@ <version>1.0</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <release-date>1993-11-00</release-date> @@ -17,6 +18,7 @@ <version>2.0</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <release-date>1994-11-22</release-date> @@ -31,6 +33,7 @@ <version>2.0.5</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/2.0"/> <derives-from id="http://freebsd.org/freebsd/2.0"/> @@ -43,6 +46,7 @@ <version>2.2.8</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/2.0.5"/> <derives-from id="http://freebsd.org/freebsd/2.0.5"/> @@ -54,6 +58,7 @@ <version>2.2.9</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/2.2.8"/> <derives-from id="http://freebsd.org/freebsd/2.2.8"/> @@ -65,6 +70,7 @@ <version>3.0</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <release-date>1998-10-16</release-date> @@ -79,6 +85,7 @@ <version>3.2</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/3.0"/> <derives-from id="http://freebsd.org/freebsd/3.0"/> @@ -90,6 +97,7 @@ <version>4.0</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <release-date>2000-03-00</release-date> @@ -104,6 +112,7 @@ <version>4.1</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.0"/> <derives-from id="http://freebsd.org/freebsd/4.0"/> @@ -116,6 +125,7 @@ <version>4.2</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.1"/> <derives-from id="http://freebsd.org/freebsd/4.1"/> @@ -128,6 +138,7 @@ <version>4.3</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.2"/> <derives-from id="http://freebsd.org/freebsd/4.2"/> @@ -140,6 +151,7 @@ <version>4.4</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.3"/> <derives-from id="http://freebsd.org/freebsd/4.3"/> @@ -152,6 +164,7 @@ <version>4.5</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.4"/> <derives-from id="http://freebsd.org/freebsd/4.4"/> @@ -164,6 +177,7 @@ <version>4.6</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.5"/> <derives-from id="http://freebsd.org/freebsd/4.5"/> @@ -176,6 +190,7 @@ <version>4.7</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.6"/> <derives-from id="http://freebsd.org/freebsd/4.6"/> @@ -188,6 +203,7 @@ <version>4.8</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.7"/> <derives-from id="http://freebsd.org/freebsd/4.7"/> @@ -200,6 +216,7 @@ <version>4.9</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.8"/> <derives-from id="http://freebsd.org/freebsd/4.8"/> @@ -212,6 +229,7 @@ <version>4.10</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/4.9"/> <derives-from id="http://freebsd.org/freebsd/4.9"/> @@ -224,6 +242,7 @@ <version>4.11</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <release-date>2000-06-24</release-date> <eol-date>2007-01-31</eol-date> @@ -239,6 +258,7 @@ <version>5.0</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <release-date>2003-01-00</release-date> @@ -253,6 +273,7 @@ <version>5.1</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/5.0"/> <derives-from id="http://freebsd.org/freebsd/5.0"/> @@ -265,6 +286,7 @@ <version>5.2</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/5.1"/> <derives-from id="http://freebsd.org/freebsd/5.1"/> @@ -277,6 +299,7 @@ <version>5.2.1</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/5.2"/> <derives-from id="http://freebsd.org/freebsd/5.2"/> @@ -289,6 +312,7 @@ <version>5.3</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/5.2.1"/> <derives-from id="http://freebsd.org/freebsd/5.2.1"/> @@ -301,6 +325,7 @@ <version>5.4</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/5.3"/> <derives-from id="http://freebsd.org/freebsd/5.3"/> @@ -313,6 +338,7 @@ <version>5.5</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <release-date>2006-05-00</release-date> @@ -327,6 +353,7 @@ <version>6.0</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/5.5"/> <derives-from id="http://freebsd.org/freebsd/5.5"/> @@ -343,6 +370,7 @@ <version>6.1</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/6.0"/> <derives-from id="http://freebsd.org/freebsd/6.0"/> </os> @@ -353,6 +381,7 @@ <version>6.2</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/6.1"/> <derives-from id="http://freebsd.org/freebsd/6.1"/> </os> @@ -363,6 +392,7 @@ <version>6.3</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/6.2"/> <derives-from id="http://freebsd.org/freebsd/6.2"/> </os> @@ -373,6 +403,7 @@ <version>6.4</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/6.3"/> <derives-from id="http://freebsd.org/freebsd/6.3"/> @@ -385,6 +416,7 @@ <version>7.0</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/6.4"/> <derives-from id="http://freebsd.org/freebsd/6.4"/> </os> @@ -395,6 +427,7 @@ <version>7.1</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/7.0"/> <derives-from id="http://freebsd.org/freebsd/7.0"/> </os> @@ -405,6 +438,7 @@ <version>7.2</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/7.1"/> <derives-from id="http://freebsd.org/freebsd/7.1"/> </os> @@ -415,6 +449,7 @@ <version>7.3</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/7.2"/> <derives-from id="http://freebsd.org/freebsd/7.2"/> </os> @@ -425,6 +460,7 @@ <version>7.4</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/7.3"/> <derives-from id="http://freebsd.org/freebsd/7.3"/> </os> @@ -435,6 +471,7 @@ <version>8.0</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/7.4"/> <derives-from id="http://freebsd.org/freebsd/7.4"/> @@ -451,6 +488,7 @@ <version>8.1</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/8.0"/> <derives-from id="http://freebsd.org/freebsd/8.0"/> </os> @@ -461,6 +499,7 @@ <version>8.2</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/8.1"/> <derives-from id="http://freebsd.org/freebsd/8.1"/> </os> @@ -471,6 +510,7 @@ <version>9.0</version> <vendor>FreeBSD Project</vendor> <family>FreeBSD</family> + <distro>freebsd</distro> <upgrades id="http://freebsd.org/freebsd/8.2"/> <derives-from id="http://freebsd.org/freebsd/8.2"/> diff --git a/data/oses/macos.xml b/data/oses/macos.xml index 258512a..cae5aed 100644 --- a/data/oses/macos.xml +++ b/data/oses/macos.xml @@ -6,6 +6,7 @@ <version>10.0</version> <vendor>Apple Inc.</vendor> <family>MacOS</family> + <distro>osx</distro> </os> <os id="http://apple.com/macosx/10.1"> @@ -15,6 +16,7 @@ <vendor>Apple Inc.</vendor> <family>MacOS</family> <upgrades id="http://apple.com/macosx/10.0" /> + <distro>osx</distro> </os> <os id="http://apple.com/macosx/10.2"> @@ -24,6 +26,7 @@ <vendor>Apple Inc.</vendor> <family>MacOS</family> <upgrades id="http://apple.com/macosx/10.1" /> + <distro>osx</distro> </os> <os id="http://apple.com/macosx/10.3"> @@ -33,6 +36,7 @@ <vendor>Apple Inc.</vendor> <family>MacOS</family> <upgrades id="http://apple.com/macosx/10.2" /> + <distro>osx</distro> </os> <os id="http://apple.com/macosx/10.4"> @@ -41,6 +45,7 @@ <version>10.4</version> <vendor>Apple Inc.</vendor> <family>MacOS</family> + <distro>osx</distro> <upgrades id="http://apple.com/macosx/10.3" /> </os> @@ -50,6 +55,7 @@ <version>10.5</version> <vendor>Apple Inc.</vendor> <family>MacOS</family> + <distro>osx</distro> <upgrades id="http://apple.com/macosx/10.4" /> </os> @@ -59,6 +65,7 @@ <version>10.6</version> <vendor>Apple Inc.</vendor> <family>MacOS</family> + <distro>osx</distro> <upgrades id="http://apple.com/macosx/10.5" /> <resources arch="all"> @@ -78,6 +85,7 @@ <version>10.7</version> <vendor>Apple Inc.</vendor> <family>MacOS</family> + <distro>osx</distro> <upgrades id="http://apple.com/macosx/10.6" /> <resources arch="all"> diff --git a/data/oses/mandrake.xml b/data/oses/mandrake.xml index 15f32a6..164f8e7 100644 --- a/data/oses/mandrake.xml +++ b/data/oses/mandrake.xml @@ -5,6 +5,7 @@ <name>Mandrake Linux 5.1</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Venice</codename> </os> @@ -14,6 +15,7 @@ <name>Mandrake Linux 5.2</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Leeloo</codename> <upgrades id="http://mandriva.com/linux/mandrake/5.1"/> <derives-from id="http://mandriva.com/linux/mandrake/5.1"/> @@ -25,6 +27,7 @@ <name>Mandrake Linux 5.3</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Festen</codename> <upgrades id="http://mandriva.com/linux/mandrake/5.2"/> <derives-from id="http://mandriva.com/linux/mandrake/5.2"/> @@ -36,6 +39,7 @@ <name>Mandrake Linux 6.0</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Venus</codename> <upgrades id="http://mandriva.com/linux/mandrake/5.2"/> <derives-from id="http://mandriva.com/linux/mandrake/5.2"/> @@ -47,6 +51,7 @@ <name>Mandrake Linux 6.1</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Helios</codename> <upgrades id="http://mandriva.com/linux/mandrake/6.0"/> <derives-from id="http://mandriva.com/linux/mandrake/6.0"/> @@ -58,6 +63,7 @@ <name>Mandrake Linux 7.0</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Air</codename> <upgrades id="http://mandriva.com/linux/mandrake/6.1"/> <derives-from id="http://mandriva.com/linux/mandrake/6.1"/> @@ -69,6 +75,7 @@ <name>Mandrake Linux 7.1</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Helium</codename> <upgrades id="http://mandriva.com/linux/mandrake/7.0"/> <derives-from id="http://mandriva.com/linux/mandrake/7.0"/> @@ -80,6 +87,7 @@ <name>Mandrake Linux 7.2</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Odyssey</codename> <upgrades id="http://mandriva.com/linux/mandrake/7.1"/> <derives-from id="http://mandriva.com/linux/mandrake/7.1"/> @@ -91,6 +99,7 @@ <name>Mandrake Linux 8.0</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Traktopel</codename> <upgrades id="http://mandriva.com/linux/mandrake/7.2"/> <derives-from id="http://mandriva.com/linux/mandrake/7.2"/> @@ -102,6 +111,7 @@ <name>Mandrake Linux 8.1</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Vitamin</codename> <upgrades id="http://mandriva.com/linux/mandrake/8.0"/> <derives-from id="http://mandriva.com/linux/mandrake/8.0"/> @@ -113,6 +123,7 @@ <name>Mandrake Linux 8.2</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Bluebird</codename> <upgrades id="http://mandriva.com/linux/mandrake/8.1"/> <derives-from id="http://mandriva.com/linux/mandrake/8.1"/> @@ -124,6 +135,7 @@ <name>Mandrake Linux 9.0</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Dolphin</codename> <upgrades id="http://mandriva.com/linux/mandrake/8.2"/> <derives-from id="http://mandriva.com/linux/mandrake/8.2"/> @@ -135,6 +147,7 @@ <name>Mandrake Linux 9.1</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Bamboo</codename> <upgrades id="http://mandriva.com/linux/mandrake/9.0"/> <derives-from id="http://mandriva.com/linux/mandrake/9.0"/> @@ -146,6 +159,7 @@ <name>Mandrake Linux 9.2</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>FiveStar</codename> <upgrades id="http://mandriva.com/linux/mandrake/9.1"/> <derives-from id="http://mandriva.com/linux/mandrake/9.1"/> @@ -157,6 +171,7 @@ <name>Mandrake Linux 10.0</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <upgrades id="http://mandriva.com/linux/mandrake/9.2"/> <derives-from id="http://mandriva.com/linux/mandrake/9.2"/> @@ -167,6 +182,7 @@ <name>Mandrake Linux 10.1</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <upgrades id="http://mandriva.com/linux/mandrake/10.0"/> <derives-from id="http://mandriva.com/linux/mandrake/10.0"/> @@ -177,6 +193,7 @@ <name>Mandrake Linux 10.2</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandrake</distro> <codename>Leeloo</codename> <upgrades id="http://mandriva.com/linux/mandrake/10.1"/> <derives-from id="http://mandriva.com/linux/mandrake/10.1"/> diff --git a/data/oses/mandriva.xml b/data/oses/mandriva.xml index d330607..0f6179a 100644 --- a/data/oses/mandriva.xml +++ b/data/oses/mandriva.xml @@ -5,6 +5,7 @@ <name>Mandriva Linux 2006</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/mandrake/10.2"/> <derives-from id="http://mandriva.com/linux/mandrake/10.2"/> @@ -15,6 +16,7 @@ <name>Mandriva Linux 2007</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/2006.0"/> <derives-from id="http://mandriva.com/linux/2006.0"/> @@ -25,6 +27,7 @@ <name>Mandriva Linux 2007 Spring</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/2007"/> <derives-from id="http://mandriva.com/linux/2007"/> @@ -35,6 +38,7 @@ <name>Mandriva Linux 2008</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/2007.1"/> <derives-from id="http://mandriva.com/linux/2007.1"/> @@ -45,6 +49,7 @@ <name>Mandriva Linux 2008 Spring</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/2008.0"/> <derives-from id="http://mandriva.com/linux/2008.0"/> @@ -55,6 +60,7 @@ <name>Mandriva Linux 2009</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/2008.1"/> <derives-from id="http://mandriva.com/linux/2008.1"/> @@ -65,6 +71,7 @@ <name>Mandriva Linux 2009 Spring</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/2009.0"/> <derives-from id="http://mandriva.com/linux/2009.0"/> @@ -75,6 +82,7 @@ <name>Mandriva Linux 2010</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/2009.1"/> <derives-from id="http://mandriva.com/linux/2009.1"/> @@ -89,6 +97,7 @@ <name>Mandriva Linux 2010 Spring</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/2010.0"/> <derives-from id="http://mandriva.com/linux/2010.0"/> @@ -99,6 +108,7 @@ <name>Mandriva Linux 2010.2</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <upgrades id="http://mandriva.com/linux/2010.1"/> <derives-from id="http://mandriva.com/linux/2010.1"/> @@ -109,6 +119,7 @@ <name>Mandriva Linux 2011</name> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mandriva</distro> <codename>Hydrogen</codename> <upgrades id="http://mandriva.com/linux/2010.2"/> <derives-from id="http://mandriva.com/linux/2010.2"/> @@ -121,6 +132,7 @@ <version>5.0</version> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mes</distro> </os> @@ -130,6 +142,7 @@ <version>5.1</version> <vendor>Mandriva</vendor> <family>Linux</family> + <distro>mes</distro> <upgrades id="http://mandriva.com/linux/server/5.0"/> <derives-from id="http://mandriva.com/linux/server/5.0"/> diff --git a/data/oses/netbsd.xml b/data/oses/netbsd.xml index 843a5d3..7f79309 100644 --- a/data/oses/netbsd.xml +++ b/data/oses/netbsd.xml @@ -6,6 +6,7 @@ <version>0.8</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <release-date>1993-04-20</release-date> </os> @@ -16,6 +17,7 @@ <version>0.9</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/0.8"/> <derives-from id="http://netbsd.org/netbsd/0.8"/> @@ -28,6 +30,7 @@ <version>1.0</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/0.9"/> <derives-from id="http://netbsd.org/netbsd/0.9"/> @@ -40,6 +43,7 @@ <version>1.1</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/1.0"/> <derives-from id="http://netbsd.org/netbsd/1.0"/> @@ -52,6 +56,7 @@ <version>1.2</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/1.1"/> <derives-from id="http://netbsd.org/netbsd/1.1"/> @@ -64,6 +69,7 @@ <version>1.3</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/1.2"/> <derives-from id="http://netbsd.org/netbsd/1.2"/> @@ -76,6 +82,7 @@ <version>1.4</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/1.3"/> <derives-from id="http://netbsd.org/netbsd/1.3"/> @@ -88,6 +95,7 @@ <version>1.5</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/1.4"/> <derives-from id="http://netbsd.org/netbsd/1.4"/> @@ -100,6 +108,7 @@ <version>1.6</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/1.5"/> <derives-from id="http://netbsd.org/netbsd/1.5"/> @@ -112,6 +121,7 @@ <version>2.0</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/1.6"/> <derives-from id="http://netbsd.org/netbsd/1.6"/> @@ -124,6 +134,7 @@ <version>3.0</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/2.0"/> <derives-from id="http://netbsd.org/netbsd/2.0"/> @@ -136,6 +147,7 @@ <version>4.0</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/3.0"/> <derives-from id="http://netbsd.org/netbsd/3.0"/> @@ -148,6 +160,7 @@ <version>5.0</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/4.0"/> <derives-from id="http://netbsd.org/netbsd/4.0"/> @@ -160,6 +173,7 @@ <version>5.1</version> <vendor>NetBSD Project</vendor> <family>NetBSD</family> + <distro>netbsd</distro> <upgrades id="http://netbsd.org/netbsd/5.0"/> <derives-from id="http://netbsd.org/netbsd/5.0"/> diff --git a/data/oses/openbsd.xml b/data/oses/openbsd.xml index 435ce87..9e8e5d1 100644 --- a/data/oses/openbsd.xml +++ b/data/oses/openbsd.xml @@ -5,6 +5,7 @@ <name>OpenBSD 4.2</name> <version>4.2</version> <family>OpenBSD</family> + <distro>openbsd</distro> <vendor>OpenBSD Project</vendor> <media arch='i386'> @@ -31,6 +32,7 @@ <name>OpenBSD 4.3</name> <version>4.3</version> <family>OpenBSD</family> + <distro>openbsd</distro> <vendor>OpenBSD Project</vendor> <upgrades id='http://openbsd.org/openbsd/4.2'/> <derives-from id='http://openbsd.org/openbsd/4.2'/> @@ -59,6 +61,7 @@ <name>OpenBSD 4.4</name> <version>4.4</version> <family>OpenBSD</family> + <distro>openbsd</distro> <vendor>OpenBSD Project</vendor> <upgrades id='http://openbsd.org/openbsd/4.3'/> <derives-from id='http://openbsd.org/openbsd/4.3'/> @@ -87,6 +90,7 @@ <name>OpenBSD 4.5</name> <version>4.5</version> <family>OpenBSD</family> + <distro>openbsd</distro> <vendor>OpenBSD Project</vendor> <upgrades id='http://openbsd.org/openbsd/4.4'/> <derives-from id='http://openbsd.org/openbsd/4.4'/> @@ -115,6 +119,7 @@ <name>OpenBSD 4.8</name> <version>4.8</version> <family>OpenBSD</family> + <distro>openbsd</distro> <vendor>OpenBSD Project</vendor> <upgrades id='http://openbsd.org/openbsd/4.5'/> <derives-from id='http://openbsd.org/openbsd/4.5'/> @@ -143,6 +148,7 @@ <name>OpenBSD 4.9</name> <version>4.9</version> <family>OpenBSD</family> + <distro>openbsd</distro> <vendor>OpenBSD Project</vendor> <upgrades id='http://openbsd.org/openbsd/4.8'/> <derives-from id='http://openbsd.org/openbsd/4.8'/> @@ -176,6 +182,7 @@ <name>OpenBSD 5.0</name> <version>5.0</version> <family>OpenBSD</family> + <distro>openbsd</distro> <vendor>OpenBSD Project</vendor> <upgrades id='http://openbsd.org/openbsd/4.9'/> <derives-from id='http://openbsd.org/openbsd/4.9'/> diff --git a/data/oses/opensuse.xml b/data/oses/opensuse.xml index c00799f..9bf5be8 100644 --- a/data/oses/opensuse.xml +++ b/data/oses/opensuse.xml @@ -6,6 +6,7 @@ <version>10.2</version> <vendor>openSUSE</vendor> <family>Linux</family> + <distro>opensuse</distro> </os> <os id="http://opensuse.org/linux/10.3"> @@ -14,6 +15,7 @@ <version>10.3</version> <vendor>openSUSE</vendor> <family>Linux</family> + <distro>opensuse</distro> <upgrades id="http://opensuse.org/linux/10.2" /> <derives-from id="http://opensuse.org/linux/10.2" /> </os> @@ -24,6 +26,7 @@ <version>11.0</version> <vendor>openSUSE</vendor> <family>Linux</family> + <distro>opensuse</distro> <upgrades id="http://opensuse.org/linux/10.3" /> <derives-from id="http://opensuse.org/linux/10.3" /> </os> @@ -34,6 +37,7 @@ <version>11.1</version> <vendor>openSUSE</vendor> <family>Linux</family> + <distro>opensuse</distro> <upgrades id="http://opensuse.org/linux/11.0" /> <derives-from id="http://opensuse.org/linux/11.0" /> </os> @@ -44,6 +48,7 @@ <version>11.2</version> <vendor>openSUSE</vendor> <family>Linux</family> + <distro>opensuse</distro> <upgrades id="http://opensuse.org/linux/11.1" /> <derives-from id="http://opensuse.org/linux/11.1" /> </os> @@ -54,6 +59,7 @@ <version>11.3</version> <vendor>openSUSE</vendor> <family>Linux</family> + <distro>opensuse</distro> <upgrades id="http://opensuse.org/linux/11.2" /> <derives-from id="http://opensuse.org/linux/11.2" /> @@ -119,6 +125,7 @@ <version>11.4</version> <vendor>openSUSE</vendor> <family>Linux</family> + <distro>opensuse</distro> <upgrades id="http://opensuse.org/linux/11.3" /> <derives-from id="http://opensuse.org/linux/11.3" /> @@ -176,6 +183,7 @@ <version>12.1</version> <vendor>openSUSE</vendor> <family>Linux</family> + <distro>opensuse</distro> <upgrades id="http://opensuse.org/linux/11.4" /> <derives-from id="http://opensuse.org/linux/11.4" /> diff --git a/data/oses/others.xml b/data/oses/others.xml index a9df676..698e1f9 100644 --- a/data/oses/others.xml +++ b/data/oses/others.xml @@ -5,6 +5,7 @@ <name>Microsoft MS-DOS</name> <vendor>Microsoft</vendor> <family>Other</family> + <distro>msdos</distro> </os> <os id="http://novell.com/netware4"> @@ -12,6 +13,7 @@ <name>Novell Netware 4</name> <vendor>Novell</vendor> <family>Other</family> + <distro>netware</distro> </os> <os id="http://novell.com/netware5"> @@ -19,6 +21,7 @@ <name>Novell Netware 5</name> <vendor>Novell</vendor> <family>Other</family> + <distro>netware</distro> </os> <os id="http://novell.com/netware6"> @@ -26,6 +29,7 @@ <name>Novell Netware 6</name> <vendor>Novell</vendor> <family>Other</family> + <distro>netware</distro> </os> </libosinfo> diff --git a/data/oses/rhel.xml b/data/oses/rhel.xml index 24f6ef2..7715a64 100644 --- a/data/oses/rhel.xml +++ b/data/oses/rhel.xml @@ -8,6 +8,7 @@ <version>2.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Pensacola</codename> <release-date>2002-03-26</release-date> @@ -20,6 +21,7 @@ <version>2.1.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Pensacola</codename> <upgrades id="http://redhat.com/rhel/2.1"/> <derives-from id="http://redhat.com/rhel/2.1"/> @@ -34,6 +36,7 @@ <version>2.1.2</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Pensacola</codename> <upgrades id="http://redhat.com/rhel/2.1/u1"/> <derives-from id="http://redhat.com/rhel/2.1/u1"/> @@ -48,6 +51,7 @@ <version>2.1.3</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Pensacola</codename> <upgrades id="http://redhat.com/rhel/2.1/u2"/> <derives-from id="http://redhat.com/rhel/2.1/u2"/> @@ -62,6 +66,7 @@ <version>2.1.4</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Pensacola</codename> <upgrades id="http://redhat.com/rhel/2.1/u3"/> <derives-from id="http://redhat.com/rhel/2.1/u3"/> @@ -76,6 +81,7 @@ <version>2.1.5</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Pensacola</codename> <upgrades id="http://redhat.com/rhel/2.1/u4"/> <derives-from id="http://redhat.com/rhel/2.1/u4"/> @@ -90,6 +96,7 @@ <version>2.1.6</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Pensacola</codename> <upgrades id="http://redhat.com/rhel/2.1/u5"/> <derives-from id="http://redhat.com/rhel/2.1/u5"/> @@ -104,6 +111,7 @@ <version>2.1.7</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Pensacola</codename> <upgrades id="http://redhat.com/rhel/2.1/u6"/> <derives-from id="http://redhat.com/rhel/2.1/u6"/> @@ -122,6 +130,7 @@ <version>3</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2003-10-22</release-date> @@ -134,6 +143,7 @@ <version>3.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2004-01-16</release-date> @@ -148,6 +158,7 @@ <version>3.2</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2004-05-18</release-date> @@ -162,6 +173,7 @@ <version>3.3</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2004-09-03</release-date> @@ -176,6 +188,7 @@ <version>3.4</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2004-12-21</release-date> @@ -190,6 +203,7 @@ <version>3.5</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2005-05-20</release-date> @@ -204,6 +218,7 @@ <version>3.6</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2005-09-28</release-date> @@ -218,6 +233,7 @@ <version>3.7</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2006-03-15</release-date> @@ -232,6 +248,7 @@ <version>3.8</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2006-07-20</release-date> @@ -246,6 +263,7 @@ <version>3.9</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Taroon</codename> <release-date>2007-06-15</release-date> @@ -264,6 +282,7 @@ <version>4.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <release-date>2005-02-15</release-date> @@ -276,6 +295,7 @@ <version>4.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <upgrades id="http://redhat.com/rhel/4.0"/> <derives-from id="http://redhat.com/rhel/4.0"/> @@ -290,6 +310,7 @@ <version>4.2</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <upgrades id="http://redhat.com/rhel/4.1"/> <derives-from id="http://redhat.com/rhel/4.1"/> @@ -304,6 +325,7 @@ <version>4.3</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <upgrades id="http://redhat.com/rhel/4.2"/> <derives-from id="http://redhat.com/rhel/4.2"/> @@ -318,6 +340,7 @@ <version>4.4</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <upgrades id="http://redhat.com/rhel/4.3"/> <derives-from id="http://redhat.com/rhel/4.3"/> @@ -332,6 +355,7 @@ <version>4.5</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <upgrades id="http://redhat.com/rhel/4.4"/> <derives-from id="http://redhat.com/rhel/4.4"/> @@ -346,6 +370,7 @@ <version>4.6</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <upgrades id="http://redhat.com/rhel/4.5"/> <derives-from id="http://redhat.com/rhel/4.5"/> @@ -360,6 +385,7 @@ <version>4.7</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <upgrades id="http://redhat.com/rhel/4.6"/> <derives-from id="http://redhat.com/rhel/4.6"/> @@ -374,6 +400,7 @@ <version>4.8</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <upgrades id="http://redhat.com/rhel/4.7"/> <derives-from id="http://redhat.com/rhel/4.7"/> @@ -401,6 +428,7 @@ <version>4.9</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Nahant</codename> <upgrades id="http://redhat.com/rhel/4.8"/> <derives-from id="http://redhat.com/rhel/4.8"/> @@ -432,6 +460,7 @@ <version>5.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Tikanga</codename> <release-date>2007-03-14</release-date> @@ -445,6 +474,7 @@ <version>5.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Tikanga</codename> <upgrades id="http://redhat.com/rhel/5.0"/> <derives-from id="http://redhat.com/rhel/5.0"/> @@ -459,6 +489,7 @@ <version>5.2</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Tikanga</codename> <upgrades id="http://redhat.com/rhel/5.1"/> <derives-from id="http://redhat.com/rhel/5.1"/> @@ -473,6 +504,7 @@ <version>5.3</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Tikanga</codename> <upgrades id="http://redhat.com/rhel/5.2"/> <derives-from id="http://redhat.com/rhel/5.2"/> @@ -487,6 +519,7 @@ <version>5.4</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Tikanga</codename> <upgrades id="http://redhat.com/rhel/5.3"/> <derives-from id="http://redhat.com/rhel/5.3"/> @@ -514,6 +547,7 @@ <version>5.5</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Tikanga</codename> <upgrades id="http://redhat.com/rhel/5.4"/> <derives-from id="http://redhat.com/rhel/5.4"/> @@ -528,6 +562,7 @@ <version>5.6</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Tikanga</codename> <upgrades id="http://redhat.com/rhel/5.5"/> <derives-from id="http://redhat.com/rhel/5.5"/> @@ -560,6 +595,7 @@ <version>5.7</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Tikanga</codename> <upgrades id="http://redhat.com/rhel/5.6"/> <derives-from id="http://redhat.com/rhel/5.6"/> @@ -587,6 +623,7 @@ <version>5.8</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Tikanga</codename> <upgrades id="http://redhat.com/rhel/5.8"/> <derives-from id="http://redhat.com/rhel/5.8"/> @@ -605,6 +642,7 @@ <version>6.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Santiago</codename> <release-date>2010-11-10</release-date> @@ -636,6 +674,7 @@ <version>6.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Santiago</codename> <upgrades id="http://redhat.com/rhel/6.0"/> <derives-from id="http://redhat.com/rhel/6.0"/> @@ -663,6 +702,7 @@ <version>6.2</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhel</distro> <codename>Santiago</codename> <upgrades id="http://redhat.com/rhel/6.1"/> <derives-from id="http://redhat.com/rhel/6.1"/> diff --git a/data/oses/rhl.xml b/data/oses/rhl.xml index 398bd73..13732a4 100644 --- a/data/oses/rhl.xml +++ b/data/oses/rhl.xml @@ -6,6 +6,7 @@ <version>1.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Mother's Day</codename> <release-date>1994-11-03</release-date> @@ -17,6 +18,7 @@ <version>1.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Mother's Day + 0.1</codename> <upgrades id="http://redhat.com/rhl/1.0"/> <derives-from id="http://redhat.com/rhl/1.0"/> @@ -30,6 +32,7 @@ <version>2.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <upgrades id="http://redhat.com/rhl/1.1"/> <derives-from id="http://redhat.com/rhl/1.1"/> @@ -42,6 +45,7 @@ <version>2.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <upgrades id="http://redhat.com/rhl/2.0"/> <derives-from id="http://redhat.com/rhl/2.0"/> @@ -54,6 +58,7 @@ <version>3.0.3</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Picasso</codename> <upgrades id="http://redhat.com/rhl/2.1"/> <derives-from id="http://redhat.com/rhl/2.1"/> @@ -67,6 +72,7 @@ <version>4.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Colgate</codename> <upgrades id="http://redhat.com/rhl/3.0.3"/> <derives-from id="http://redhat.com/rhl/3.0.3"/> @@ -80,6 +86,7 @@ <version>4.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Vanderbilt</codename> <upgrades id="http://redhat.com/rhl/4.0"/> <derives-from id="http://redhat.com/rhl/4.0"/> @@ -93,6 +100,7 @@ <version>4.2</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Biltmore</codename> <upgrades id="http://redhat.com/rhl/4.1"/> <derives-from id="http://redhat.com/rhl/4.1"/> @@ -106,6 +114,7 @@ <version>5.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Hurricane</codename> <upgrades id="http://redhat.com/rhl/4.2"/> <derives-from id="http://redhat.com/rhl/4.2"/> @@ -119,6 +128,7 @@ <version>5.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Manhattan</codename> <upgrades id="http://redhat.com/rhl/5.0"/> <derives-from id="http://redhat.com/rhl/5.0"/> @@ -132,6 +142,7 @@ <version>5.2</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Apollo</codename> <upgrades id="http://redhat.com/rhl/5.1"/> <derives-from id="http://redhat.com/rhl/5.1"/> @@ -145,6 +156,7 @@ <version>6.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Hedwig</codename> <upgrades id="http://redhat.com/rhl/5.1"/> <derives-from id="http://redhat.com/rhl/5.1"/> @@ -158,6 +170,7 @@ <version>6.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Cartman</codename> <upgrades id="http://redhat.com/rhl/6.0"/> <derives-from id="http://redhat.com/rhl/6.0"/> @@ -171,6 +184,7 @@ <version>6.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Zoot</codename> <upgrades id="http://redhat.com/rhl/6.1"/> <derives-from id="http://redhat.com/rhl/6.1"/> @@ -184,6 +198,7 @@ <version>7</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Guinness</codename> <upgrades id="http://redhat.com/rhl/6.1"/> <derives-from id="http://redhat.com/rhl/6.1"/> @@ -197,6 +212,7 @@ <version>7.1</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Seawolf</codename> <upgrades id="http://redhat.com/rhl/7"/> <derives-from id="http://redhat.com/rhl/7"/> @@ -211,6 +227,7 @@ <version>7.2</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Enigma</codename> <upgrades id="http://redhat.com/rhl/7.1"/> <derives-from id="http://redhat.com/rhl/7.1"/> @@ -225,6 +242,7 @@ <version>7.3</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Valhalla</codename> <upgrades id="http://redhat.com/rhl/7.2"/> <derives-from id="http://redhat.com/rhl/7.2"/> @@ -239,6 +257,7 @@ <version>8.0</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Psyche</codename> <upgrades id="http://redhat.com/rhl/7.3"/> <derives-from id="http://redhat.com/rhl/7.3"/> @@ -253,6 +272,7 @@ <version>9</version> <vendor>Red Hat, Inc</vendor> <family>Linux</family> + <distro>rhl</distro> <codename>Shrike</codename> <upgrades id="http://redhat.com/rhl/8.0"/> <derives-from id="http://redhat.com/rhl/8.0"/> diff --git a/data/oses/solaris.xml b/data/oses/solaris.xml index af6e1c7..6774feb 100644 --- a/data/oses/solaris.xml +++ b/data/oses/solaris.xml @@ -6,6 +6,7 @@ <version>9</version> <vendor>Sun</vendor> <family>Solaris</family> + <distro>solaris</distro> </os> <os id="http://sun.com/solaris10"> @@ -14,6 +15,7 @@ <version>10</version> <vendor>Sun</vendor> <family>Solaris</family> + <distro>solaris</distro> <upgrades id="http://sun.com/solaris9"/> <devices> @@ -27,6 +29,7 @@ <version>2009.06</version> <vendor>Sun</vendor> <family>Solaris</family> + <distro>opensolaris</distro> <devices> <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> diff --git a/data/oses/suse.xml b/data/oses/suse.xml index 3cd0463..a4b788c 100644 --- a/data/oses/suse.xml +++ b/data/oses/suse.xml @@ -6,6 +6,7 @@ <version>9</version> <vendor>Novell</vendor> <family>Linux</family> + <distro>sles</distro> </os> <os id="http://suse.com/linux/sles10"> @@ -14,6 +15,7 @@ <version>10</version> <vendor>Novell</vendor> <family>Linux</family> + <distro>sles</distro> <upgrades id="http://suse.com/linux/sles9"/> </os> @@ -23,6 +25,7 @@ <version>11</version> <vendor>Novell</vendor> <family>Linux</family> + <distro>sles</distro> <upgrades id="http://suse.com/linux/sles10"/> <devices> @@ -37,6 +40,7 @@ <version>9</version> <vendor>Novell</vendor> <family>Linux</family> + <distro>sled</distro> </os> <os id="http://suse.com/linux/sled10"> @@ -45,6 +49,7 @@ <version>10</version> <vendor>Novell</vendor> <family>Linux</family> + <distro>sled</distro> <upgrades id="http://suse.com/linux/sled9"/> <resources arch="all"> @@ -65,6 +70,7 @@ <version>11</version> <vendor>Novell</vendor> <family>Linux</family> + <distro>sled</distro> <upgrades id="http://suse.com/linux/sled10"/> <resources arch="all"> diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml index a5d1095..0934b01 100644 --- a/data/oses/ubuntu.xml +++ b/data/oses/ubuntu.xml @@ -6,6 +6,7 @@ <version>4.10</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Warty Warthog</codename> <release-date>2004-10-20</release-date> @@ -47,6 +48,7 @@ <version>5.04</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Hoary Hedgehog</codename> <upgrades id="http://ubuntu.com/warty"/> <derives-from id="http://ubuntu.com/warty"/> @@ -118,6 +120,7 @@ <version>5.10</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Breezy Badger</codename> <upgrades id="http://ubuntu.com/hoary"/> <derives-from id="http://ubuntu.com/hoary"/> @@ -217,6 +220,7 @@ <version>6.06</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Dapper Drake</codename> <upgrades id="http://ubuntu.com/breezy"/> <derives-from id="http://ubuntu.com/breezy"/> @@ -343,6 +347,7 @@ <version>6.10</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Edgy Eft</codename> <upgrades id="http://ubuntu.com/dapper"/> <derives-from id="http://ubuntu.com/dapper"/> @@ -422,6 +427,7 @@ <version>7.04</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Feisty Fawn</codename> <upgrades id="http://ubuntu.com/edgy"/> <derives-from id="http://ubuntu.com/edgy"/> @@ -483,6 +489,7 @@ <version>7.10</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Gutsy Gibbon</codename> <upgrades id="http://ubuntu.com/feisty"/> <derives-from id="http://ubuntu.com/feisty"/> @@ -544,6 +551,7 @@ <version>8.04</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Hardy Heron</codename> <upgrades id="http://ubuntu.com/gutsy"/> <derives-from id="http://ubuntu.com/gutsy"/> @@ -618,6 +626,7 @@ <version>8.10</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Intrepid Ibex</codename> <upgrades id="http://ubuntu.com/hardy"/> <derives-from id="http://ubuntu.com/hardy"/> @@ -670,6 +679,7 @@ <version>9.04</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Jaunty Jackalope</codename> <upgrades id="http://ubuntu.com/intrepid"/> <derives-from id="http://ubuntu.com/intrepid"/> @@ -726,6 +736,7 @@ <version>9.10</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Karmic Koala</codename> <upgrades id="http://ubuntu.com/jaunty"/> <derives-from id="http://ubuntu.com/jaunty"/> @@ -778,6 +789,7 @@ <version>10.04</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Lucid Lynx</codename> <upgrades id="http://ubuntu.com/karmic"/> <derives-from id="http://ubuntu.com/karmic"/> @@ -823,6 +835,7 @@ <version>10.10</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Maverick Meerkat</codename> <upgrades id="http://ubuntu.com/lucid"/> <derives-from id="http://ubuntu.com/lucid"/> @@ -888,6 +901,7 @@ <version>11.04</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Natty Narwhal</codename> <upgrades id="http://ubuntu.com/maverick"/> <derives-from id="http://ubuntu.com/maverick"/> @@ -953,6 +967,7 @@ <version>11.10</version> <vendor>Canonical Ltd</vendor> <family>Linux</family> + <distro>ubuntu</distro> <codename>Oneiric Ocelot</codename> <upgrades id="http://ubuntu.com/natty"/> <derives-from id="http://ubuntu.com/natty"/> diff --git a/data/oses/windows.xml b/data/oses/windows.xml index 5cce132..8e71ddf 100644 --- a/data/oses/windows.xml +++ b/data/oses/windows.xml @@ -5,6 +5,7 @@ <name>Microsoft Windows</name> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <devices> <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL --> @@ -20,6 +21,7 @@ <version>4.0</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <resources arch="i386"> @@ -37,6 +39,7 @@ <version>4.1</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win95"/> @@ -60,6 +63,7 @@ <version>4.9</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win98"/> @@ -84,6 +88,7 @@ <version>5.0</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <media arch="i386"> @@ -116,6 +121,7 @@ <version>5.1</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win2k"/> @@ -163,6 +169,7 @@ <version>5.2</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <media arch="i386"> @@ -219,6 +226,7 @@ <version>5.2</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win2k3"/> @@ -270,6 +278,7 @@ <version>6.0</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win2k3r2"/> @@ -323,6 +332,7 @@ <version>6.1</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win2k8"/> @@ -361,6 +371,7 @@ <version>6.0</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/winxp"/> @@ -399,6 +410,7 @@ <version>6.1</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/vista"/> @@ -444,6 +456,7 @@ <version>6.2</version> <vendor>Microsoft Corporation</vendor> <family>Windows</family> + <distro>windows</distro> <derives-from id="http://microsoft.com/windows"/> <upgrades id="http://microsoft.com/win7"/> -- 1.7.7.6