summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre/free-distros.patch
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-07-27 00:02:04 +0000
committerroot <root@rshg054.dnsready.net>2012-07-27 00:02:04 +0000
commit1616f43507a7f8785a479ecf6ce905828a232f02 (patch)
tree2da0cc5a8e57effad5bcd327be1957b187b67f36 /libre/virtualbox-libre/free-distros.patch
parentc4c5143448e3be178c254e8f9f1ab24661dc3b20 (diff)
Fri Jul 27 00:02:04 UTC 2012
Diffstat (limited to 'libre/virtualbox-libre/free-distros.patch')
-rw-r--r--libre/virtualbox-libre/free-distros.patch1383
1 files changed, 1383 insertions, 0 deletions
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
new file mode 100644
index 000000000..7920fb6ab
--- /dev/null
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -0,0 +1,1383 @@
+--- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-07-25 14:51:03.569003667 -0300
++++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-07-25 14:51:03.652333615 -0300
+@@ -44,94 +44,38 @@
+ * first matching string found, will be used. */
+ static const osTypePattern gs_OSTypePattern[] =
+ {
+- { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
+
+- /* Windows */
+- { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
+- { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
+- { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
+- { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
+- { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
+- { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
+- { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
+- { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
+- { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
+- { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
+- { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
+- { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
+- { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
+- { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
+- { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
+- { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
+- { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
+- { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
+- { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
+-
+- /* Solaris */
+- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*1[01])|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
+- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*1[01])|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
+- { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
+- { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
+-
+- /* OS/2 */
+- { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
+- { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
+- { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
+- { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
+- { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
+-
+- /* Code names for Linux distributions */
+- { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+- { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
+- { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
+- { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "Debian" },
+- { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
+- { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
+-
+- /* Regular names of Linux distributions */
+- { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
+- { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
+- { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
+- { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
+- { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
+- { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
+- { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
+- { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
+- { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
+- { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
+- { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
+- { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
+- { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
+- { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
+- { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
+- { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
+- { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
+- { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
+- { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
+- { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
+- { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
+- { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
+- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
+- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
+- { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
+- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
+- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
+- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
++ /* Code names for GNU/Linux distributions */
++ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
++ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
++ { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++ { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
++ { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
++ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
++
++ /* Regular names of GNU/Linux distributions and GNU-Hurd */
++ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
++ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
++ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
++ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
++ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
++ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
++ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
++ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
++ { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
++ { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
++ { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
++ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
++ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
++ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
++ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
++ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
++ { QRegExp("Hu", Qt::CaseInsensitive), "GNUHurd" },
++ { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "GNULinux" },
+
+ /* Other */
+- { QRegExp("L4", Qt::CaseInsensitive), "L4" },
+- { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
+- { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
+- { QRegExp("Op.*B.*64", Qt::CaseInsensitive), "OpenBSD_64" },
+- { QRegExp("Op.*B", Qt::CaseInsensitive), "OpenBSD" },
+- { QRegExp("Ne.*B.*64", Qt::CaseInsensitive), "NetBSD_64" },
+- { QRegExp("Ne.*B", Qt::CaseInsensitive), "NetBSD" },
+- { QRegExp("QN", Qt::CaseInsensitive), "QNX" },
+- { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "MacOS_64" },
+- { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
+- { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
+- { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
+ { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
+ };
+
+--- VirtualBox-4.1.18.orig/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.498764160 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.548761649 -0300
+@@ -3227,40 +3227,18 @@
+ } aConvertOSTypes[] =
+ {
+ { "unknown", "Other" },
+- { "dos", "DOS" },
+- { "win31", "Windows31" },
+- { "win95", "Windows95" },
+- { "win98", "Windows98" },
+- { "winme", "WindowsMe" },
+- { "winnt4", "WindowsNT4" },
+- { "win2k", "Windows2000" },
+- { "winxp", "WindowsXP" },
+- { "win2k3", "Windows2003" },
+- { "winvista", "WindowsVista" },
+- { "win2k8", "Windows2008" },
+- { "os2warp3", "OS2Warp3" },
+- { "os2warp4", "OS2Warp4" },
+- { "os2warp45", "OS2Warp45" },
+- { "ecs", "OS2eCS" },
+- { "linux22", "Linux22" },
+- { "linux24", "Linux24" },
+- { "linux26", "Linux26" },
+- { "archlinux", "ArchLinux" },
+- { "debian", "Debian" },
+- { "opensuse", "OpenSUSE" },
+- { "fedoracore", "Fedora" },
+- { "gentoo", "Gentoo" },
+- { "mandriva", "Mandriva" },
+- { "redhat", "RedHat" },
+- { "ubuntu", "Ubuntu" },
+- { "xandros", "Xandros" },
+- { "freebsd", "FreeBSD" },
+- { "openbsd", "OpenBSD" },
+- { "netbsd", "NetBSD" },
+- { "netware", "Netware" },
+- { "solaris", "Solaris" },
+- { "opensolaris", "OpenSolaris" },
+- { "l4", "L4" }
++ { "gnu", "GNU" },
++ { "gnuhurd", "GNUHurd" },
++ { "gnulinux", "GNULinux" },
++ { "parabola", "Parabola" },
++ { "gnewsense", "gNewSense" },
++ { "blag", "Blag" },
++ { "dragora", "Dragora" },
++ { "ututo", "Ututo" },
++ { "musix", "Musix" },
++ { "trisquel", "Trisquel" },
++ { "dynebolic", "Dynebolic" },
++ { "venenux", "Venenux" },
+ };
+
+ void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)
+--- VirtualBox-4.1.18.orig/src/VBox/Main/xml/SettingsConverter.xsl 2012-07-25 15:21:04.553581275 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/xml/SettingsConverter.xsl 2012-07-25 15:21:04.593579427 -0300
+@@ -729,40 +729,18 @@
+ <xsl:attribute name="OSType">
+ <xsl:choose>
+ <xsl:when test="@OSType='unknown'">Other</xsl:when>
+- <xsl:when test="@OSType='dos'">DOS</xsl:when>
+- <xsl:when test="@OSType='win31'">Windows31</xsl:when>
+- <xsl:when test="@OSType='win95'">Windows95</xsl:when>
+- <xsl:when test="@OSType='win98'">Windows98</xsl:when>
+- <xsl:when test="@OSType='winme'">WindowsMe</xsl:when>
+- <xsl:when test="@OSType='winnt4'">WindowsNT4</xsl:when>
+- <xsl:when test="@OSType='win2k'">Windows2000</xsl:when>
+- <xsl:when test="@OSType='winxp'">WindowsXP</xsl:when>
+- <xsl:when test="@OSType='win2k3'">Windows2003</xsl:when>
+- <xsl:when test="@OSType='winvista'">WindowsVista</xsl:when>
+- <xsl:when test="@OSType='win2k8'">Windows2008</xsl:when>
+- <xsl:when test="@OSType='os2warp3'">OS2Warp3</xsl:when>
+- <xsl:when test="@OSType='os2warp4'">OS2Warp4</xsl:when>
+- <xsl:when test="@OSType='os2warp45'">OS2Warp45</xsl:when>
+- <xsl:when test="@OSType='ecs'">OS2eCS</xsl:when>
+- <xsl:when test="@OSType='linux22'">Linux22</xsl:when>
+- <xsl:when test="@OSType='linux24'">Linux24</xsl:when>
+- <xsl:when test="@OSType='linux26'">Linux26</xsl:when>
+- <xsl:when test="@OSType='archlinux'">ArchLinux</xsl:when>
+- <xsl:when test="@OSType='debian'">Debian</xsl:when>
+- <xsl:when test="@OSType='opensuse'">OpenSUSE</xsl:when>
+- <xsl:when test="@OSType='fedoracore'">Fedora</xsl:when>
+- <xsl:when test="@OSType='gentoo'">Gentoo</xsl:when>
+- <xsl:when test="@OSType='mandriva'">Mandriva</xsl:when>
+- <xsl:when test="@OSType='redhat'">RedHat</xsl:when>
+- <xsl:when test="@OSType='ubuntu'">Ubuntu</xsl:when>
+- <xsl:when test="@OSType='xandros'">Xandros</xsl:when>
+- <xsl:when test="@OSType='freebsd'">FreeBSD</xsl:when>
+- <xsl:when test="@OSType='openbsd'">OpenBSD</xsl:when>
+- <xsl:when test="@OSType='netbsd'">NetBSD</xsl:when>
+- <xsl:when test="@OSType='netware'">Netware</xsl:when>
+- <xsl:when test="@OSType='solaris'">Solaris</xsl:when>
+- <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when>
+- <xsl:when test="@OSType='l4'">L4</xsl:when>
++ <xsl:when test="@OSType='gnu'">GNU</xsl:when>
++ <xsl:when test="@OSType='gnuhurd'">GNUHurd</xsl:when>
++ <xsl:when test="@OSType='gnulinux'">GNULinux</xsl:when>
++ <xsl:when test="@OSType='parabola'">Parabola</xsl:when>
++ <xsl:when test="@OSType='gnewsense'">gNewSense</xsl:when>
++ <xsl:when test="@OSType='blag'">Blag</xsl:when>
++ <xsl:when test="@OSType='dragora'">Dragora</xsl:when>
++ <xsl:when test="@OSType='ututo'">Ututo</xsl:when>
++ <xsl:when test="@OSType='musix'">Musix</xsl:when>
++ <xsl:when test="@OSType='trisquel'">Trisquel</xsl:when>
++ <xsl:when test="@OSType='dynebolic'">Dynebolic</xsl:when>
++ <xsl:when test="@OSType='venenux'">Venenux</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
+--- VirtualBox-4.1.18.orig/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2012-07-25 15:04:37.856003691 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2012-07-25 15:04:37.892668156 -0300
+@@ -137,75 +137,27 @@
+ <xsd:simpleType name="TGuestOSType">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="Other"/>
+- <xsd:enumeration value="DOS"/>
+- <xsd:enumeration value="Netware"/>
+- <xsd:enumeration value="L4"/>
+- <xsd:enumeration value="Windows31"/>
+- <xsd:enumeration value="Windows95"/>
+- <xsd:enumeration value="Windows98"/>
+- <xsd:enumeration value="WindowsMe"/>
+- <xsd:enumeration value="WindowsNT4"/>
+- <xsd:enumeration value="Windows2000"/>
+- <xsd:enumeration value="WindowsXP"/>
+- <xsd:enumeration value="WindowsXP_64"/>
+- <xsd:enumeration value="Windows2003"/>
+- <xsd:enumeration value="Windows2003_64"/>
+- <xsd:enumeration value="WindowsVista"/>
+- <xsd:enumeration value="WindowsVista_64"/>
+- <xsd:enumeration value="Windows2008"/>
+- <xsd:enumeration value="Windows2008_64"/>
+- <xsd:enumeration value="Windows7"/>
+- <xsd:enumeration value="Windows7_64"/>
+- <xsd:enumeration value="Windows8"/>
+- <xsd:enumeration value="Windows8_64"/>
+- <xsd:enumeration value="WindowsNT"/>
+- <xsd:enumeration value="OS2Warp3"/>
+- <xsd:enumeration value="OS2Warp4"/>
+- <xsd:enumeration value="OS2Warp45"/>
+- <xsd:enumeration value="OS2eCS"/>
+- <xsd:enumeration value="OS2"/>
+- <xsd:enumeration value="Linux22"/>
+- <xsd:enumeration value="Linux24"/>
+- <xsd:enumeration value="Linux24_64"/>
+- <xsd:enumeration value="Linux26"/>
+- <xsd:enumeration value="Linux26_64"/>
+- <xsd:enumeration value="ArchLinux"/>
+- <xsd:enumeration value="ArchLinux_64"/>
+- <xsd:enumeration value="Debian"/>
+- <xsd:enumeration value="Debian_64"/>
+- <xsd:enumeration value="OpenSUSE"/>
+- <xsd:enumeration value="OpenSUSE_64"/>
+- <xsd:enumeration value="Fedora"/>
+- <xsd:enumeration value="Fedora_64"/>
+- <xsd:enumeration value="Gentoo"/>
+- <xsd:enumeration value="Gentoo_64"/>
+- <xsd:enumeration value="Mandriva"/>
+- <xsd:enumeration value="Mandriva_64"/>
+- <xsd:enumeration value="RedHat"/>
+- <xsd:enumeration value="RedHat_64"/>
+- <xsd:enumeration value="Turbolinux"/>
+- <xsd:enumeration value="Turbolinux_64"/>
+- <xsd:enumeration value="Ubuntu"/>
+- <xsd:enumeration value="Ubuntu_64"/>
+- <xsd:enumeration value="Xandros"/>
+- <xsd:enumeration value="Xandros_64"/>
+- <xsd:enumeration value="Oracle"/>
+- <xsd:enumeration value="Oracle_64"/>
+- <xsd:enumeration value="Linux"/>
+- <xsd:enumeration value="FreeBSD"/>
+- <xsd:enumeration value="FreeBSD_64"/>
+- <xsd:enumeration value="OpenBSD"/>
+- <xsd:enumeration value="OpenBSD_64"/>
+- <xsd:enumeration value="NetBSD"/>
+- <xsd:enumeration value="NetBSD_64"/>
+- <xsd:enumeration value="Solaris"/>
+- <xsd:enumeration value="Solaris_64"/>
+- <xsd:enumeration value="OpenSolaris"/>
+- <xsd:enumeration value="OpenSolaris_64"/>
+- <xsd:enumeration value="QNX"/>
+- <xsd:enumeration value="MacOS"/>
+- <xsd:enumeration value="MacOS_64"/>
+- <xsd:enumeration value="JRockitVE"/>
++ <xsd:enumeration value="GNU"/>
++ <xsd:enumeration value="GNU_64"/>
++ <xsd:enumeration value="GNUHurd"/>
++ <xsd:enumeration value="GNULinux"/>
++ <xsd:enumeration value="GNULinux_64"/>
++ <xsd:enumeration value="Parabola"/>
++ <xsd:enumeration value="Parabola_64"/>
++ <xsd:enumeration value="gNewSense"/>
++ <xsd:enumeration value="gNewSense_64"/>
++ <xsd:enumeration value="Blag"/>
++ <xsd:enumeration value="Blag_64"/>
++ <xsd:enumeration value="Dragora"/>
++ <xsd:enumeration value="Dragora_64"/>
++ <xsd:enumeration value="Ututo"/>
++ <xsd:enumeration value="Ututo_64"/>
++ <xsd:enumeration value="Musix"/>
++ <xsd:enumeration value="Musix_64"/>
++ <xsd:enumeration value="Trisquel"/>
++ <xsd:enumeration value="Trisquel_64"/>
++ <xsd:enumeration value="Dynebolic"/>
++ <xsd:enumeration value="Venenux"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+--- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-25 15:40:56.733096866 -0300
++++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-25 15:40:56.796426519 -0300
+@@ -1,75 +1,27 @@
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource prefix="/">
+- <file alias="os_archlinux.png">images/os_archlinux.png</file>
+- <file alias="os_archlinux_64.png">images/os_archlinux_64.png</file>
+- <file alias="os_debian.png">images/os_debian.png</file>
+- <file alias="os_debian_64.png">images/os_debian_64.png</file>
+- <file alias="os_dos.png">images/os_dos.png</file>
+- <file alias="os_fedora.png">images/os_fedora.png</file>
+- <file alias="os_fedora_64.png">images/os_fedora_64.png</file>
+- <file alias="os_freebsd.png">images/os_freebsd.png</file>
+- <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file>
+- <file alias="os_gentoo.png">images/os_gentoo.png</file>
+- <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file>
+- <file alias="os_jrockitve.png">images/os_jrockitve.png</file>
+- <file alias="os_l4.png">images/os_l4.png</file>
+- <file alias="os_linux_other.png">images/os_linux_other.png</file>
+- <file alias="os_linux22.png">images/os_linux22.png</file>
+- <file alias="os_linux24.png">images/os_linux24.png</file>
+- <file alias="os_linux24_64.png">images/os_linux24_64.png</file>
+- <file alias="os_linux26.png">images/os_linux26.png</file>
+- <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
+- <file alias="os_mandriva.png">images/os_mandriva.png</file>
+- <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
+- <file alias="os_netbsd.png">images/os_netbsd.png</file>
+- <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file>
+- <file alias="os_netware.png">images/os_netware.png</file>
+- <file alias="os_openbsd.png">images/os_openbsd.png</file>
+- <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
+- <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file>
+- <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file>
+- <file alias="os_opensuse.png">images/os_opensuse.png</file>
+- <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
+- <file alias="os_os2_other.png">images/os_os2_other.png</file>
+- <file alias="os_os2ecs.png">images/os_os2ecs.png</file>
+- <file alias="os_os2warp3.png">images/os_os2warp3.png</file>
+- <file alias="os_os2warp4.png">images/os_os2warp4.png</file>
+- <file alias="os_os2warp45.png">images/os_os2warp45.png</file>
++ <file alias="os_parabola.png">images/os_parabola.png</file>
++ <file alias="os_parabola_64.png">images/os_parabola_64.png</file>
++ <file alias="os_gnewsense.png">images/os_gnewsense.png</file>
++ <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file>
++ <file alias="os_blag.png">images/os_blag.png</file>
++ <file alias="os_blag_64.png">images/os_blag_64.png</file>
++ <file alias="os_ututo.png">images/os_ututo.png</file>
++ <file alias="os_ututo_64.png">images/os_ututo_64.png</file>
++ <file alias="os_gnu.png">images/os_gnu.png</file>
++ <file alias="os_gnu_64.png">images/os_gnu_64.png</file>
++ <file alias="os_gnuhurd.png">images/os_gnuhurd.png</file>
++ <file alias="os_gnulinux.png">images/os_gnulinux.png</file>
++ <file alias="os_gnulinux_64.png">images/os_gnulinux_64.png</file>
++ <file alias="os_musix.png">images/os_musix.png</file>
++ <file alias="os_musix_64.png">images/os_musix_64.png</file>
++ <file alias="os_dragora.png">images/os_dragora.png</file>
++ <file alias="os_dragora_64.png">images/os_dragora_64.png</file>
+ <file alias="os_other.png">images/os_other.png</file>
+- <file alias="os_qnx.png">images/os_qnx.png</file>
+- <file alias="os_redhat.png">images/os_redhat.png</file>
+- <file alias="os_redhat_64.png">images/os_redhat_64.png</file>
+- <file alias="os_turbolinux.png">images/os_turbolinux.png</file>
+- <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file>
+- <file alias="os_solaris.png">images/os_solaris.png</file>
+- <file alias="os_solaris_64.png">images/os_solaris_64.png</file>
+- <file alias="os_ubuntu.png">images/os_ubuntu.png</file>
+- <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file>
+- <file alias="os_win_other.png">images/os_win_other.png</file>
+- <file alias="os_win2k.png">images/os_win2k.png</file>
+- <file alias="os_win2k3.png">images/os_win2k3.png</file>
+- <file alias="os_win2k3_64.png">images/os_win2k3_64.png</file>
+- <file alias="os_win2k8.png">images/os_win2k8.png</file>
+- <file alias="os_win2k8_64.png">images/os_win2k8_64.png</file>
+- <file alias="os_win31.png">images/os_win31.png</file>
+- <file alias="os_win7.png">images/os_win7.png</file>
+- <file alias="os_win7_64.png">images/os_win7_64.png</file>
+- <file alias="os_win8.png">images/os_win8.png</file>
+- <file alias="os_win8_64.png">images/os_win8_64.png</file>
+- <file alias="os_win95.png">images/os_win95.png</file>
+- <file alias="os_win98.png">images/os_win98.png</file>
+- <file alias="os_winme.png">images/os_winme.png</file>
+- <file alias="os_winnt4.png">images/os_winnt4.png</file>
+- <file alias="os_winvista.png">images/os_winvista.png</file>
+- <file alias="os_winvista_64.png">images/os_winvista_64.png</file>
+- <file alias="os_winxp.png">images/os_winxp.png</file>
+- <file alias="os_winxp_64.png">images/os_winxp_64.png</file>
+- <file alias="os_xandros.png">images/os_xandros.png</file>
+- <file alias="os_xandros_64.png">images/os_xandros_64.png</file>
+- <file alias="os_oracle.png">images/os_oracle.png</file>
+- <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
+- <file alias="os_macosx.png">images/os_macosx.png</file>
+- <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
++ <file alias="os_dynebolic.png">images/os_dynebolic.png</file>
++ <file alias="os_venenux.png">images/os_venenux.png</file>
++ <file alias="os_trisquel.png">images/os_trisquel.png</file>
++ <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file>
+ <file alias="hd_16px.png">images/hd_16px.png</file>
+ <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
+ <file alias="hd_32px.png">images/hd_32px.png</file>
+--- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/Global.cpp 2012-06-20 10:17:34.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/src-all/Global.cpp 2012-07-25 19:32:44.482993976 -0300
+@@ -35,284 +35,90 @@
+ VBOXOSTYPE_Unknown, VBOXOSHINT_NONE,
+ 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows31, "Windows 3.1",
+- VBOXOSTYPE_Win31, VBOXOSHINT_NONE,
+- 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows95, "Windows 95",
+- VBOXOSTYPE_Win95, VBOXOSHINT_NONE,
+- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows98, "Windows 98",
+- VBOXOSTYPE_Win98, VBOXOSHINT_NONE,
+- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsMe, "Windows Me",
+- VBOXOSTYPE_WinMe, VBOXOSHINT_NONE,
+- 64, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT4, "Windows NT 4",
+- VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE,
+- 128, 16, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2000, "Windows 2000",
+- VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET,
+- 168, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP, "Windows XP",
+- VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET,
+- 192, 16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP_64, "Windows XP (64 bit)",
+- VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 192, 16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003, "Windows 2003",
+- VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET,
+- 256, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003_64, "Windows 2003 (64 bit)",
+- VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 256, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista, "Windows Vista",
+- VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET,
+- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista_64, "Windows Vista (64 bit)",
+- VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008, "Windows 2008",
+- VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET,
+- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008_64, "Windows 2008 (64 bit)",
+- VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7, "Windows 7",
+- VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET,
+- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7_64, "Windows 7 (64 bit)",
+- VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows8, "Windows 8",
+- VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
+- 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows8_64, "Windows 8 (64 bit)",
+- VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 1536,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT, "Other Windows",
+- VBOXOSTYPE_WinNT, VBOXOSHINT_NONE,
+- 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux22, "Linux 2.2",
+- VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC,
+- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24, "Linux 2.4",
+- VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC,
+- 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24_64, "Linux 2.4 (64 bit)",
+- VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+- 128, 4, 4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "GNU", "GNU", SchemaDefs_OSTypeId_GNU, "GNU",
++ VBOXOSTYPE_GNU, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "GNU", "GNU", SchemaDefs_OSTypeId_GNU_64, "GNU (64 bit)",
++ VBOXOSTYPE_GNU_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "GNU-Hurd", "GNU-Hurd", SchemaDefs_OSTypeId_GNUHurd, "GNU-Hurd",
++ VBOXOSTYPE_GNUHurd, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26, "Linux 2.6",
+- VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_GNULinux, "GNU/Linux",
++ VBOXOSTYPE_GNULinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26_64, "Linux 2.6 (64 bit)",
+- VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_GNULinux_64, "GNU/Linux (64 bit)",
++ VBOXOSTYPE_GNULinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux, "Arch Linux",
+- VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Parabola, "Parabola GNU/Linux-libre",
++ VBOXOSTYPE_Parabola, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux_64, "Arch Linux (64 bit)",
+- VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Parabola_64, "Parabola GNU/Linux-libre (64 bit)",
++ VBOXOSTYPE_Parabola_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Debian, "Debian",
+- VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_gNewSense, "gNewSense",
++ VBOXOSTYPE_gNewSense, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Debian_64, "Debian (64 bit)",
+- VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_gNewSense_64, "gNewSense (64 bit)",
++ VBOXOSTYPE_gNewSense_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
+- { "Linux", "Linux", SchemaDefs_OSTypeId_OpenSUSE, "openSUSE",
+- VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_OpenSUSE_64, "openSUSE (64 bit)",
+- VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Fedora, "Fedora",
+- VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Blag, "Blag Linux and GNU",
++ VBOXOSTYPE_Blag, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Fedora_64, "Fedora (64 bit)",
+- VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Blag_64, "Blag Linux and GNU (64 bit)",
++ VBOXOSTYPE_Blag_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Gentoo, "Gentoo",
+- VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dragora, "Dragora",
++ VBOXOSTYPE_Dragora, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Gentoo_64, "Gentoo (64 bit)",
+- VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dragora_64, "Dragora (64 bit)",
++ VBOXOSTYPE_Dragora_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva, "Mandriva",
+- VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva_64, "Mandriva (64 bit)",
+- VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_RedHat, "Red Hat",
+- VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Ututo, "Ututo XS",
++ VBOXOSTYPE_Ututo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_RedHat_64, "Red Hat (64 bit)",
+- VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Ututo_64, "Ututo XS (64 bit)",
++ VBOXOSTYPE_Ututo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux",
+- VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Musix, "Musix",
++ VBOXOSTYPE_Musix, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux (64 bit)",
+- VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Musix_64, "Musix (64 bit)",
++ VBOXOSTYPE_Musix_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Ubuntu, "Ubuntu",
+- VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Trisquel, "Trisquel",
++ VBOXOSTYPE_Trisquel, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
+ 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Ubuntu_64, "Ubuntu (64 bit)",
+- VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Trisquel_64, "Trisquel (64 bit)",
++ VBOXOSTYPE_Trisquel_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros, "Xandros",
+- VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC,
+- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)",
+- VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle",
+- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dynebolic, "Dyne:bolic",
++ VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)",
+- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Venenux, "Venenux",
++ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux, "Other Linux",
+- VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+- 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris, "Oracle Solaris 10 5/09 and earlier",
+- VBOXOSTYPE_Solaris, VBOXOSHINT_NONE,
+- 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris_64, "Oracle Solaris 10 5/09 and earlier (64 bit)",
+- VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
+- 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris, "Oracle Solaris 10 10/09 and later",
+- VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET,
+- 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris_64, "Oracle Solaris 10 10/09 and later (64 bit)",
+- VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD, "FreeBSD",
+- VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE,
+- 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD_64, "FreeBSD (64 bit)",
+- VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
+- 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "BSD", "BSD", SchemaDefs_OSTypeId_OpenBSD, "OpenBSD",
+- VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX,
+- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "BSD", "BSD", SchemaDefs_OSTypeId_OpenBSD_64, "OpenBSD (64 bit)",
+- VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
+- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "BSD", "BSD", SchemaDefs_OSTypeId_NetBSD, "NetBSD",
+- VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE,
+- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "BSD", "BSD", SchemaDefs_OSTypeId_NetBSD_64, "NetBSD (64 bit)",
+- VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
+- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp3, "OS/2 Warp 3",
+- VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX,
+- 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp4, "OS/2 Warp 4",
+- VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX,
+- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp45, "OS/2 Warp 4.5",
+- VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX,
+- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2eCS, "eComStation",
+- VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX,
+- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2, "Other OS/2",
+- VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX,
+- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS, "Mac OS X Server",
+- VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
+- 1024, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
+- StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
+- ChipsetType_ICH9, AudioControllerType_HDA },
+- { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS_64, "Mac OS X Server (64 bit)",
+- VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
+- 1024, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
+- StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
+- ChipsetType_ICH9, AudioControllerType_HDA },
+- { "Other", "Other", SchemaDefs_OSTypeId_DOS, "DOS",
+- VBOXOSTYPE_DOS, VBOXOSHINT_NONE,
+- 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "Other", "Other", SchemaDefs_OSTypeId_Netware, "Netware",
+- VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX,
+- 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Other", "Other", SchemaDefs_OSTypeId_L4, "L4",
+- VBOXOSTYPE_L4, VBOXOSHINT_NONE,
+- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Other", "Other", SchemaDefs_OSTypeId_QNX, "QNX",
+- VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX,
+- 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Other", "Other", SchemaDefs_OSTypeId_JRockitVE, "JRockitVE",
+- VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
+- 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
+ };
+
+ /**
+--- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-07-25 21:44:01.290876720 -0300
++++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-07-25 22:00:57.819380802 -0300
+@@ -4875,75 +4875,27 @@
+ static const char *kOSTypeIcons [][2] =
+ {
+ {"Other", ":/os_other.png"},
+- {"DOS", ":/os_dos.png"},
+- {"Netware", ":/os_netware.png"},
+- {"L4", ":/os_l4.png"},
+- {"Windows31", ":/os_win31.png"},
+- {"Windows95", ":/os_win95.png"},
+- {"Windows98", ":/os_win98.png"},
+- {"WindowsMe", ":/os_winme.png"},
+- {"WindowsNT4", ":/os_winnt4.png"},
+- {"Windows2000", ":/os_win2k.png"},
+- {"WindowsXP", ":/os_winxp.png"},
+- {"WindowsXP_64", ":/os_winxp_64.png"},
+- {"Windows2003", ":/os_win2k3.png"},
+- {"Windows2003_64", ":/os_win2k3_64.png"},
+- {"WindowsVista", ":/os_winvista.png"},
+- {"WindowsVista_64", ":/os_winvista_64.png"},
+- {"Windows2008", ":/os_win2k8.png"},
+- {"Windows2008_64", ":/os_win2k8_64.png"},
+- {"Windows7", ":/os_win7.png"},
+- {"Windows7_64", ":/os_win7_64.png"},
+- {"Windows8", ":/os_win8.png"},
+- {"Windows8_64", ":/os_win8_64.png"},
+- {"WindowsNT", ":/os_win_other.png"},
+- {"OS2Warp3", ":/os_os2warp3.png"},
+- {"OS2Warp4", ":/os_os2warp4.png"},
+- {"OS2Warp45", ":/os_os2warp45.png"},
+- {"OS2eCS", ":/os_os2ecs.png"},
+- {"OS2", ":/os_os2_other.png"},
+- {"Linux22", ":/os_linux22.png"},
+- {"Linux24", ":/os_linux24.png"},
+- {"Linux24_64", ":/os_linux24_64.png"},
+- {"Linux26", ":/os_linux26.png"},
+- {"Linux26_64", ":/os_linux26_64.png"},
+- {"ArchLinux", ":/os_archlinux.png"},
+- {"ArchLinux_64", ":/os_archlinux_64.png"},
+- {"Debian", ":/os_debian.png"},
+- {"Debian_64", ":/os_debian_64.png"},
+- {"OpenSUSE", ":/os_opensuse.png"},
+- {"OpenSUSE_64", ":/os_opensuse_64.png"},
+- {"Fedora", ":/os_fedora.png"},
+- {"Fedora_64", ":/os_fedora_64.png"},
+- {"Gentoo", ":/os_gentoo.png"},
+- {"Gentoo_64", ":/os_gentoo_64.png"},
+- {"Mandriva", ":/os_mandriva.png"},
+- {"Mandriva_64", ":/os_mandriva_64.png"},
+- {"RedHat", ":/os_redhat.png"},
+- {"RedHat_64", ":/os_redhat_64.png"},
+- {"Turbolinux", ":/os_turbolinux.png"},
+- {"Turbolinux_64", ":/os_turbolinux_64.png"},
+- {"Ubuntu", ":/os_ubuntu.png"},
+- {"Ubuntu_64", ":/os_ubuntu_64.png"},
+- {"Xandros", ":/os_xandros.png"},
+- {"Xandros_64", ":/os_xandros_64.png"},
+- {"Oracle", ":/os_oracle.png"},
+- {"Oracle_64", ":/os_oracle_64.png"},
+- {"Linux", ":/os_linux_other.png"},
+- {"FreeBSD", ":/os_freebsd.png"},
+- {"FreeBSD_64", ":/os_freebsd_64.png"},
+- {"OpenBSD", ":/os_openbsd.png"},
+- {"OpenBSD_64", ":/os_openbsd_64.png"},
+- {"NetBSD", ":/os_netbsd.png"},
+- {"NetBSD_64", ":/os_netbsd_64.png"},
+- {"Solaris", ":/os_solaris.png"},
+- {"Solaris_64", ":/os_solaris_64.png"},
+- {"OpenSolaris", ":/os_oraclesolaris.png"},
+- {"OpenSolaris_64", ":/os_oraclesolaris_64.png"},
+- {"QNX", ":/os_qnx.png"},
+- {"MacOS", ":/os_macosx.png"},
+- {"MacOS_64", ":/os_macosx_64.png"},
+- {"JRockitVE", ":/os_jrockitve.png"},
++ {"GNU", ":/os_gnu.png"},
++ {"GNU_64", ":/os_gnu_64.png"},
++ {"GNUHurd", ":/os_gnuhurd.png"},
++ {"GNULinux", ":/os_gnulinux.png"},
++ {"GNULinux_64", ":/os_gnulinux_64.png"},
++ {"Parabola", ":/os_parabola.png"},
++ {"Parabola_64", ":/os_parabola_64.png"},
++ {"gNewSense", ":/os_gnewsense.png"},
++ {"gNewSense_64", ":/os_gnewsense_64.png"},
++ {"Blag", ":/os_blag.png"},
++ {"Blag_64", ":/os_blag_64.png"},
++ {"Dragora", ":/os_dragora.png"},
++ {"Dragora_64", ":/os_dragora_64.png"},
++ {"Ututo", ":/os_ututo.png"},
++ {"Ututo_64", ":/os_ututo_64.png"},
++ {"Musix", ":/os_musix.png"},
++ {"Musix_64", ":/os_musix_64.png"},
++ {"Trisquel", ":/os_trisquel.png"},
++ {"Trisquel_64", ":/os_trisquel_64.png"},
++ {"Dynebolic", ":/os_dynebolic.png"},
++ {"Venenux", ":/os_venenux.png"},
+ };
+ for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
+ {
+--- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp.orig 2012-06-20 10:16:38.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2012-07-25 22:07:51.232436783 -0300
+@@ -192,17 +192,10 @@
+ if (typeIndex != -1)
+ mCbType->setCurrentIndex (typeIndex);
+ }
+- /* Or select WinXP item for Windows family as default */
+- else if (familyId == "Windows")
++ /* Or select Parabola GNU/Linux-libre item for GNU/Linux family as default */
++ else if (familyId == "GNU/Linux")
+ {
+- int xpIndex = mCbType->findData ("WindowsXP", RoleTypeID);
+- if (xpIndex != -1)
+- mCbType->setCurrentIndex (xpIndex);
+- }
+- /* Or select Ubuntu item for Linux family as default */
+- else if (familyId == "Linux")
+- {
+- int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID);
++ int ubIndex = mCbType->findData ("Parabola", RoleTypeID);
+ if (ubIndex != -1)
+ mCbType->setCurrentIndex (ubIndex);
+ }
+--- VirtualBox-4.1.18.orig/include/VBox/ostypes.h 2012-06-20 10:07:51.000000000 -0300
++++ VirtualBox-4.1.18/include/VBox/ostypes.h 2012-07-25 23:20:57.322757456 -0300
+@@ -43,77 +43,27 @@
+ typedef enum VBOXOSTYPE
+ {
+ VBOXOSTYPE_Unknown = 0,
+- VBOXOSTYPE_DOS = 0x10000,
+- VBOXOSTYPE_Win31 = 0x15000,
+- VBOXOSTYPE_Win9x = 0x20000,
+- VBOXOSTYPE_Win95 = 0x21000,
+- VBOXOSTYPE_Win98 = 0x22000,
+- VBOXOSTYPE_WinMe = 0x23000,
+- VBOXOSTYPE_WinNT = 0x30000,
+- VBOXOSTYPE_WinNT4 = 0x31000,
+- VBOXOSTYPE_Win2k = 0x32000,
+- VBOXOSTYPE_WinXP = 0x33000,
+- VBOXOSTYPE_WinXP_x64 = 0x33100,
+- VBOXOSTYPE_Win2k3 = 0x34000,
+- VBOXOSTYPE_Win2k3_x64 = 0x34100,
+- VBOXOSTYPE_WinVista = 0x35000,
+- VBOXOSTYPE_WinVista_x64 = 0x35100,
+- VBOXOSTYPE_Win2k8 = 0x36000,
+- VBOXOSTYPE_Win2k8_x64 = 0x36100,
+- VBOXOSTYPE_Win7 = 0x37000,
+- VBOXOSTYPE_Win7_x64 = 0x37100,
+- VBOXOSTYPE_Win8 = 0x38000,
+- VBOXOSTYPE_Win8_x64 = 0x38100,
+- VBOXOSTYPE_OS2 = 0x40000,
+- VBOXOSTYPE_OS2Warp3 = 0x41000,
+- VBOXOSTYPE_OS2Warp4 = 0x42000,
+- VBOXOSTYPE_OS2Warp45 = 0x43000,
+- VBOXOSTYPE_ECS = 0x44000,
+- VBOXOSTYPE_Linux = 0x50000,
+- VBOXOSTYPE_Linux_x64 = 0x50100,
+- VBOXOSTYPE_Linux22 = 0x51000,
+- VBOXOSTYPE_Linux24 = 0x52000,
+- VBOXOSTYPE_Linux24_x64 = 0x52100,
+- VBOXOSTYPE_Linux26 = 0x53000,
+- VBOXOSTYPE_Linux26_x64 = 0x53100,
+- VBOXOSTYPE_ArchLinux = 0x54000,
+- VBOXOSTYPE_ArchLinux_x64 = 0x54100,
+- VBOXOSTYPE_Debian = 0x55000,
+- VBOXOSTYPE_Debian_x64 = 0x55100,
+- VBOXOSTYPE_OpenSUSE = 0x56000,
+- VBOXOSTYPE_OpenSUSE_x64 = 0x56100,
+- VBOXOSTYPE_FedoraCore = 0x57000,
+- VBOXOSTYPE_FedoraCore_x64 = 0x57100,
+- VBOXOSTYPE_Gentoo = 0x58000,
+- VBOXOSTYPE_Gentoo_x64 = 0x58100,
+- VBOXOSTYPE_Mandriva = 0x59000,
+- VBOXOSTYPE_Mandriva_x64 = 0x59100,
+- VBOXOSTYPE_RedHat = 0x5A000,
+- VBOXOSTYPE_RedHat_x64 = 0x5A100,
+- VBOXOSTYPE_Turbolinux = 0x5B000,
+- VBOXOSTYPE_Turbolinux_x64 = 0x5B100,
+- VBOXOSTYPE_Ubuntu = 0x5C000,
+- VBOXOSTYPE_Ubuntu_x64 = 0x5C100,
+- VBOXOSTYPE_Xandros = 0x5D000,
+- VBOXOSTYPE_Xandros_x64 = 0x5D100,
+- VBOXOSTYPE_Oracle = 0x5E000,
+- VBOXOSTYPE_Oracle_x64 = 0x5E100,
+- VBOXOSTYPE_FreeBSD = 0x60000,
+- VBOXOSTYPE_FreeBSD_x64 = 0x60100,
+- VBOXOSTYPE_OpenBSD = 0x61000,
+- VBOXOSTYPE_OpenBSD_x64 = 0x61100,
+- VBOXOSTYPE_NetBSD = 0x62000,
+- VBOXOSTYPE_NetBSD_x64 = 0x62100,
+- VBOXOSTYPE_Netware = 0x70000,
+- VBOXOSTYPE_Solaris = 0x80000,
+- VBOXOSTYPE_Solaris_x64 = 0x80100,
+- VBOXOSTYPE_OpenSolaris = 0x81000,
+- VBOXOSTYPE_OpenSolaris_x64 = 0x81100,
+- VBOXOSTYPE_L4 = 0x90000,
+- VBOXOSTYPE_QNX = 0xA0000,
+- VBOXOSTYPE_MacOS = 0xB0000,
+- VBOXOSTYPE_MacOS_x64 = 0xB0100,
+- VBOXOSTYPE_JRockitVE = 0xC0000,
++ VBOXOSTYPE_GNU = 0x10000,
++ VBOXOSTYPE_GNU_x64 = 0x10100,
++ VBOXOSTYPE_GNUHurd = 0x20000,
++ VBOXOSTYPE_GNULinux = 0x30000,
++ VBOXOSTYPE_GNULinux_x64 = 0x30100,
++ VBOXOSTYPE_Parabola = 0x31000,
++ VBOXOSTYPE_Parabola_x64 = 0x31100,
++ VBOXOSTYPE_gNewSense = 0x32000,
++ VBOXOSTYPE_gNewSense_x64 = 0x32100,
++ VBOXOSTYPE_Blag = 0x33000,
++ VBOXOSTYPE_Blag_x64 = 0x33100,
++ VBOXOSTYPE_Dragora = 0x34000,
++ VBOXOSTYPE_Dragora_x64 = 0x34100,
++ VBOXOSTYPE_Ututo = 0x35000,
++ VBOXOSTYPE_Ututo_x64 = 0x35100,
++ VBOXOSTYPE_Musix = 0x36000,
++ VBOXOSTYPE_Musix_x64 = 0x36100,
++ VBOXOSTYPE_Trisquel = 0x37000,
++ VBOXOSTYPE_Trisquel_x64 = 0x37100,
++ VBOXOSTYPE_Dynebolic = 0x38000,
++ VBOXOSTYPE_Venenux = 0x39000,
+ /** The bit number which indicates 64-bit or 32-bit. */
+ #define VBOXOSTYPE_x64_BIT 8
+ /** The mask which indicates 64-bit. */
+@@ -129,16 +79,11 @@
+ typedef enum VBOXOSFAMILY
+ {
+ VBOXOSFAMILY_Unknown = 0,
+- VBOXOSFAMILY_Windows32 = 1,
+- VBOXOSFAMILY_Windows64 = 2,
+- VBOXOSFAMILY_Linux32 = 3,
+- VBOXOSFAMILY_Linux64 = 4,
+- VBOXOSFAMILY_FreeBSD32 = 5,
+- VBOXOSFAMILY_FreeBSD64 = 6,
+- VBOXOSFAMILY_Solaris32 = 7,
+- VBOXOSFAMILY_Solaris64 = 8,
+- VBOXOSFAMILY_MacOSX32 = 9,
+- VBOXOSFAMILY_MacOSX64 = 10,
++ VBOXOSFAMILY_GNU32 = 1,
++ VBOXOSFAMILY_GNU64 = 2,
++ VBOXOSFAMILY_GNUHurd = 3,
++ VBOXOSFAMILY_GNULinux32 = 4,
++ VBOXOSFAMILY_GNULinux64 = 5,
+ /** The usual 32-bit hack. */
+ VBOXOSFAMILY_32BIT_HACK = 0x7fffffff
+ } VBOXOSFAMILY;
+--- VirtualBox-4.1.18.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-06-20 10:17:35.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-07-26 01:28:50.033551279 -0300
+@@ -49,94 +49,33 @@
+ g_osTypes[] =
+ {
+ { ovf::CIMOSType_CIMOS_Unknown, SchemaDefs_OSTypeId_Other },
+- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2 },
+- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp3 },
+- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp4 },
+- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp45 },
+- { ovf::CIMOSType_CIMOS_MSDOS, SchemaDefs_OSTypeId_DOS },
+- { ovf::CIMOSType_CIMOS_WIN3x, SchemaDefs_OSTypeId_Windows31 },
+- { ovf::CIMOSType_CIMOS_WIN95, SchemaDefs_OSTypeId_Windows95 },
+- { ovf::CIMOSType_CIMOS_WIN98, SchemaDefs_OSTypeId_Windows98 },
+- { ovf::CIMOSType_CIMOS_WINNT, SchemaDefs_OSTypeId_WindowsNT },
+- { ovf::CIMOSType_CIMOS_WINNT, SchemaDefs_OSTypeId_WindowsNT4 },
+- { ovf::CIMOSType_CIMOS_NetWare, SchemaDefs_OSTypeId_Netware },
+- { ovf::CIMOSType_CIMOS_NovellOES, SchemaDefs_OSTypeId_Netware },
+- { ovf::CIMOSType_CIMOS_Solaris, SchemaDefs_OSTypeId_Solaris },
+- { ovf::CIMOSType_CIMOS_SunOS, SchemaDefs_OSTypeId_Solaris },
+- { ovf::CIMOSType_CIMOS_FreeBSD, SchemaDefs_OSTypeId_FreeBSD },
+- { ovf::CIMOSType_CIMOS_NetBSD, SchemaDefs_OSTypeId_NetBSD },
+- { ovf::CIMOSType_CIMOS_QNX, SchemaDefs_OSTypeId_QNX },
+- { ovf::CIMOSType_CIMOS_Windows2000, SchemaDefs_OSTypeId_Windows2000 },
+- { ovf::CIMOSType_CIMOS_WindowsMe, SchemaDefs_OSTypeId_WindowsMe },
+- { ovf::CIMOSType_CIMOS_OpenBSD, SchemaDefs_OSTypeId_OpenBSD },
+- { ovf::CIMOSType_CIMOS_WindowsXP, SchemaDefs_OSTypeId_WindowsXP },
+- { ovf::CIMOSType_CIMOS_WindowsXPEmbedded, SchemaDefs_OSTypeId_WindowsXP },
+- { ovf::CIMOSType_CIMOS_WindowsEmbeddedforPointofService, SchemaDefs_OSTypeId_WindowsXP },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003, SchemaDefs_OSTypeId_Windows2003 },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003_64, SchemaDefs_OSTypeId_Windows2003_64 },
+- { ovf::CIMOSType_CIMOS_WindowsXP_64, SchemaDefs_OSTypeId_WindowsXP_64 },
+- { ovf::CIMOSType_CIMOS_WindowsVista, SchemaDefs_OSTypeId_WindowsVista },
+- { ovf::CIMOSType_CIMOS_WindowsVista_64, SchemaDefs_OSTypeId_WindowsVista_64 },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008, SchemaDefs_OSTypeId_Windows2008 },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64, SchemaDefs_OSTypeId_Windows2008_64 },
+- { ovf::CIMOSType_CIMOS_FreeBSD_64, SchemaDefs_OSTypeId_FreeBSD_64 },
+- { ovf::CIMOSType_CIMOS_MACOS, SchemaDefs_OSTypeId_MacOS },
+- { ovf::CIMOSType_CIMOS_MACOS, SchemaDefs_OSTypeId_MacOS_64 }, // there is no CIM 64-bit type for this
+-
+- // Linuxes
+- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, SchemaDefs_OSTypeId_RedHat },
+- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, SchemaDefs_OSTypeId_RedHat_64 },
+- { ovf::CIMOSType_CIMOS_Solaris_64, SchemaDefs_OSTypeId_Solaris_64 },
+- { ovf::CIMOSType_CIMOS_SUSE, SchemaDefs_OSTypeId_OpenSUSE },
+- { ovf::CIMOSType_CIMOS_SLES, SchemaDefs_OSTypeId_OpenSUSE },
+- { ovf::CIMOSType_CIMOS_NovellLinuxDesktop, SchemaDefs_OSTypeId_OpenSUSE },
+- { ovf::CIMOSType_CIMOS_SUSE_64, SchemaDefs_OSTypeId_OpenSUSE_64 },
+- { ovf::CIMOSType_CIMOS_SLES_64, SchemaDefs_OSTypeId_OpenSUSE_64 },
+- { ovf::CIMOSType_CIMOS_LINUX, SchemaDefs_OSTypeId_Linux },
+- { ovf::CIMOSType_CIMOS_LINUX, SchemaDefs_OSTypeId_Linux22 },
+- { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, SchemaDefs_OSTypeId_Linux },
+- { ovf::CIMOSType_CIMOS_TurboLinux, SchemaDefs_OSTypeId_Turbolinux },
+- { ovf::CIMOSType_CIMOS_TurboLinux_64, SchemaDefs_OSTypeId_Turbolinux_64 },
+- { ovf::CIMOSType_CIMOS_Mandriva, SchemaDefs_OSTypeId_Mandriva },
+- { ovf::CIMOSType_CIMOS_Mandriva_64, SchemaDefs_OSTypeId_Mandriva_64 },
+- { ovf::CIMOSType_CIMOS_Ubuntu, SchemaDefs_OSTypeId_Ubuntu },
+- { ovf::CIMOSType_CIMOS_Ubuntu_64, SchemaDefs_OSTypeId_Ubuntu_64 },
+- { ovf::CIMOSType_CIMOS_Debian, SchemaDefs_OSTypeId_Debian },
+- { ovf::CIMOSType_CIMOS_Debian_64, SchemaDefs_OSTypeId_Debian_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_4_x, SchemaDefs_OSTypeId_Linux24 },
+- { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, SchemaDefs_OSTypeId_Linux24_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Linux26 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Linux26_64 },
+- { ovf::CIMOSType_CIMOS_Linux_64, SchemaDefs_OSTypeId_Linux26_64 },
+-
+- // types that we have support for but CIM doesn't
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_ArchLinux },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_ArchLinux_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Fedora },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Fedora_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Gentoo },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Gentoo_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Xandros },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Xandros_64 },
+- { ovf::CIMOSType_CIMOS_Solaris, SchemaDefs_OSTypeId_OpenSolaris },
+- { ovf::CIMOSType_CIMOS_Solaris_64, SchemaDefs_OSTypeId_OpenSolaris_64 },
+-
+- // types added with CIM 2.25.0 follow:
+- { ovf::CIMOSType_CIMOS_WindowsServer2008R2, SchemaDefs_OSTypeId_Windows2008 }, // duplicate, see above
+-// { ovf::CIMOSType_CIMOS_VMwareESXi = 104, // we can't run ESX in a VM
+- { ovf::CIMOSType_CIMOS_Windows7, SchemaDefs_OSTypeId_Windows7 },
+- { ovf::CIMOSType_CIMOS_Windows7, SchemaDefs_OSTypeId_Windows7_64 }, // there is no CIM 64-bit type for this
+- { ovf::CIMOSType_CIMOS_CentOS, SchemaDefs_OSTypeId_RedHat },
+- { ovf::CIMOSType_CIMOS_CentOS_64, SchemaDefs_OSTypeId_RedHat_64 },
+- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux, SchemaDefs_OSTypeId_Oracle },
+- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux_64, SchemaDefs_OSTypeId_Oracle_64 },
+- { ovf::CIMOSType_CIMOS_eComStation, SchemaDefs_OSTypeId_OS2eCS }
+-
+- // there are no CIM types for these, so these turn to "other" on export:
+- // SchemaDefs_OSTypeId_OpenBSD
+- // SchemaDefs_OSTypeId_OpenBSD_64
+- // SchemaDefs_OSTypeId_NetBSD
+- // SchemaDefs_OSTypeId_NetBSD_64
++
++ // Custom OS
++ { ovf::CIMOSType_CIMOS_GNU, SchemaDefs_OSTypeId_GNU },
++ { ovf::CIMOSType_CIMOS_GNU_64, SchemaDefs_OSTypeId_GNU_64 },
++ { ovf::CIMOSType_CIMOS_GNUHurd, SchemaDefs_OSTypeId_GNUHurd },
++ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_GNULinux },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_GNULinux_64 },
++
++ // GNU/Linux free distros
++ { ovf::CIMOSType_CIMOS_gNewSense, SchemaDefs_OSTypeId_gNewSense },
++ { ovf::CIMOSType_CIMOS_gNewSense_64, SchemaDefs_OSTypeId_gNewSense_64 },
++ { ovf::CIMOSType_CIMOS_Dragora, SchemaDefs_OSTypeId_Dragora },
++ { ovf::CIMOSType_CIMOS_Dragora_64, SchemaDefs_OSTypeId_Dragora_64 },
++ { ovf::CIMOSType_CIMOS_Musix, SchemaDefs_OSTypeId_Musix },
++ { ovf::CIMOSType_CIMOS_Musix_64, SchemaDefs_OSTypeId_Musix_64 },
++ { ovf::CIMOSType_CIMOS_Trisquel, SchemaDefs_OSTypeId_Trisquel },
++ { ovf::CIMOSType_CIMOS_Trisquel_64, SchemaDefs_OSTypeId_Trisquel_64 },
++ { ovf::CIMOSType_CIMOS_Dynebolic, SchemaDefs_OSTypeId_Dynebolic },
++ { ovf::CIMOSType_CIMOS_Venenux, SchemaDefs_OSTypeId_Venenux },
++
++ // GNU/Linux free distros that we have support for but CIM doesn't
++ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_Parabola },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_Parabola_64 },
++ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_Blag },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_Blag_64 },
++ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_Ututo },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_Ututo_64 },
+
+ };
+
+@@ -150,53 +89,34 @@
+ /* These are the 32-Bit ones. They are sorted by priority. */
+ static const osTypePattern g_osTypesPattern[] =
+ {
+- {"Windows NT", SchemaDefs_OSTypeId_WindowsNT4},
+- {"Windows XP", SchemaDefs_OSTypeId_WindowsXP},
+- {"Windows 2000", SchemaDefs_OSTypeId_Windows2000},
+- {"Windows 2003", SchemaDefs_OSTypeId_Windows2003},
+- {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista},
+- {"Windows 2008", SchemaDefs_OSTypeId_Windows2008},
+- {"SUSE", SchemaDefs_OSTypeId_OpenSUSE},
+- {"Novell", SchemaDefs_OSTypeId_OpenSUSE},
+- {"Red Hat", SchemaDefs_OSTypeId_RedHat},
+- {"Mandriva", SchemaDefs_OSTypeId_Mandriva},
+- {"Ubuntu", SchemaDefs_OSTypeId_Ubuntu},
+- {"Debian", SchemaDefs_OSTypeId_Debian},
+- {"QNX", SchemaDefs_OSTypeId_QNX},
+- {"Linux 2.4", SchemaDefs_OSTypeId_Linux24},
+- {"Linux 2.6", SchemaDefs_OSTypeId_Linux26},
+- {"Linux", SchemaDefs_OSTypeId_Linux},
+- {"OpenSolaris", SchemaDefs_OSTypeId_OpenSolaris},
+- {"Solaris", SchemaDefs_OSTypeId_OpenSolaris},
+- {"FreeBSD", SchemaDefs_OSTypeId_FreeBSD},
+- {"NetBSD", SchemaDefs_OSTypeId_NetBSD},
+- {"Windows 95", SchemaDefs_OSTypeId_Windows95},
+- {"Windows 98", SchemaDefs_OSTypeId_Windows98},
+- {"Windows Me", SchemaDefs_OSTypeId_WindowsMe},
+- {"Windows 3.", SchemaDefs_OSTypeId_Windows31},
+- {"DOS", SchemaDefs_OSTypeId_DOS},
+- {"OS2", SchemaDefs_OSTypeId_OS2}
++
++ {"Parabola GNU/Linux-libre", SchemaDefs_OSTypeId_Parabola},
++ {"gNewSense", SchemaDefs_OSTypeId_gNewSense},
++ {"Blag Linux and GNU", SchemaDefs_OSTypeId_Blag},
++ {"Dragora", SchemaDefs_OSTypeId_Dragora},
++ {"Ututo XS", SchemaDefs_OSTypeId_Ututo},
++ {"Musix", SchemaDefs_OSTypeId_Musix},
++ {"Trisquel", SchemaDefs_OSTypeId_Trisquel},
++ {"Dyne:bolic", SchemaDefs_OSTypeId_Dynebolic},
++ {"Venenux", SchemaDefs_OSTypeId_Venenux},
++ {"GNU", SchemaDefs_OSTypeId_GNU},
++ {"GNU-Hurd", SchemaDefs_OSTypeId_GNUHurd},
++ {"GNU/Linux", SchemaDefs_OSTypeId_GNULinux},
++
+ };
+
+ /* These are the 64-Bit ones. They are sorted by priority. */
+ static const osTypePattern g_osTypesPattern64[] =
+ {
+- {"Windows XP", SchemaDefs_OSTypeId_WindowsXP_64},
+- {"Windows 2003", SchemaDefs_OSTypeId_Windows2003_64},
+- {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista_64},
+- {"Windows 2008", SchemaDefs_OSTypeId_Windows2008_64},
+- {"SUSE", SchemaDefs_OSTypeId_OpenSUSE_64},
+- {"Novell", SchemaDefs_OSTypeId_OpenSUSE_64},
+- {"Red Hat", SchemaDefs_OSTypeId_RedHat_64},
+- {"Mandriva", SchemaDefs_OSTypeId_Mandriva_64},
+- {"Ubuntu", SchemaDefs_OSTypeId_Ubuntu_64},
+- {"Debian", SchemaDefs_OSTypeId_Debian_64},
+- {"Linux 2.4", SchemaDefs_OSTypeId_Linux24_64},
+- {"Linux 2.6", SchemaDefs_OSTypeId_Linux26_64},
+- {"Linux", SchemaDefs_OSTypeId_Linux26_64},
+- {"OpenSolaris", SchemaDefs_OSTypeId_OpenSolaris_64},
+- {"Solaris", SchemaDefs_OSTypeId_OpenSolaris_64},
+- {"FreeBSD", SchemaDefs_OSTypeId_FreeBSD_64},
++ {"Parabola GNU/Linux-libre", SchemaDefs_OSTypeId_Parabola_64},
++ {"gNewSense", SchemaDefs_OSTypeId_gNewSense_64},
++ {"Blag Linux and GNU", SchemaDefs_OSTypeId_Blag_64},
++ {"Dragora", SchemaDefs_OSTypeId_Dragora_64},
++ {"Ututo XS", SchemaDefs_OSTypeId_Ututo_64},
++ {"Musix", SchemaDefs_OSTypeId_Musix_64},
++ {"Trisquel", SchemaDefs_OSTypeId_Trisquel_64},
++ {"GNU", SchemaDefs_OSTypeId_GNU_64},
++ {"GNU/Linux", SchemaDefs_OSTypeId_GNULinux_64},
+ };
+
+ /**
+--- VirtualBox-4.1.18.orig/src/VBox/Main/include/ovfreader.h 2012-06-20 10:17:34.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/include/ovfreader.h 2012-07-26 03:51:21.807619186 -0300
+@@ -34,119 +34,24 @@
+
+ enum CIMOSType_T
+ {
+- CIMOSType_CIMOS_Unknown = 0,
+- CIMOSType_CIMOS_Other = 1,
+- CIMOSType_CIMOS_MACOS = 2,
+- CIMOSType_CIMOS_ATTUNIX = 3,
+- CIMOSType_CIMOS_DGUX = 4,
+- CIMOSType_CIMOS_DECNT = 5,
+- CIMOSType_CIMOS_Tru64UNIX = 6,
+- CIMOSType_CIMOS_OpenVMS = 7,
+- CIMOSType_CIMOS_HPUX = 8,
+- CIMOSType_CIMOS_AIX = 9,
+- CIMOSType_CIMOS_MVS = 10,
+- CIMOSType_CIMOS_OS400 = 11,
+- CIMOSType_CIMOS_OS2 = 12,
+- CIMOSType_CIMOS_JavaVM = 13,
+- CIMOSType_CIMOS_MSDOS = 14,
+- CIMOSType_CIMOS_WIN3x = 15,
+- CIMOSType_CIMOS_WIN95 = 16,
+- CIMOSType_CIMOS_WIN98 = 17,
+- CIMOSType_CIMOS_WINNT = 18,
+- CIMOSType_CIMOS_WINCE = 19,
+- CIMOSType_CIMOS_NCR3000 = 20,
+- CIMOSType_CIMOS_NetWare = 21,
+- CIMOSType_CIMOS_OSF = 22,
+- CIMOSType_CIMOS_DCOS = 23,
+- CIMOSType_CIMOS_ReliantUNIX = 24,
+- CIMOSType_CIMOS_SCOUnixWare = 25,
+- CIMOSType_CIMOS_SCOOpenServer = 26,
+- CIMOSType_CIMOS_Sequent = 27,
+- CIMOSType_CIMOS_IRIX = 28,
+- CIMOSType_CIMOS_Solaris = 29,
+- CIMOSType_CIMOS_SunOS = 30,
+- CIMOSType_CIMOS_U6000 = 31,
+- CIMOSType_CIMOS_ASERIES = 32,
+- CIMOSType_CIMOS_HPNonStopOS = 33,
+- CIMOSType_CIMOS_HPNonStopOSS = 34,
+- CIMOSType_CIMOS_BS2000 = 35,
+- CIMOSType_CIMOS_LINUX = 36,
+- CIMOSType_CIMOS_Lynx = 37,
+- CIMOSType_CIMOS_XENIX = 38,
+- CIMOSType_CIMOS_VM = 39,
+- CIMOSType_CIMOS_InteractiveUNIX = 40,
+- CIMOSType_CIMOS_BSDUNIX = 41,
+- CIMOSType_CIMOS_FreeBSD = 42,
+- CIMOSType_CIMOS_NetBSD = 43,
+- CIMOSType_CIMOS_GNUHurd = 44,
+- CIMOSType_CIMOS_OS9 = 45,
+- CIMOSType_CIMOS_MACHKernel = 46,
+- CIMOSType_CIMOS_Inferno = 47,
+- CIMOSType_CIMOS_QNX = 48,
+- CIMOSType_CIMOS_EPOC = 49,
+- CIMOSType_CIMOS_IxWorks = 50,
+- CIMOSType_CIMOS_VxWorks = 51,
+- CIMOSType_CIMOS_MiNT = 52,
+- CIMOSType_CIMOS_BeOS = 53,
+- CIMOSType_CIMOS_HPMPE = 54,
+- CIMOSType_CIMOS_NextStep = 55,
+- CIMOSType_CIMOS_PalmPilot = 56,
+- CIMOSType_CIMOS_Rhapsody = 57,
+- CIMOSType_CIMOS_Windows2000 = 58,
+- CIMOSType_CIMOS_Dedicated = 59,
+- CIMOSType_CIMOS_OS390 = 60,
+- CIMOSType_CIMOS_VSE = 61,
+- CIMOSType_CIMOS_TPF = 62,
+- CIMOSType_CIMOS_WindowsMe = 63,
+- CIMOSType_CIMOS_CalderaOpenUNIX = 64,
+- CIMOSType_CIMOS_OpenBSD = 65,
+- CIMOSType_CIMOS_NotApplicable = 66,
+- CIMOSType_CIMOS_WindowsXP = 67,
+- CIMOSType_CIMOS_zOS = 68,
+- CIMOSType_CIMOS_MicrosoftWindowsServer2003 = 69,
+- CIMOSType_CIMOS_MicrosoftWindowsServer2003_64 = 70,
+- CIMOSType_CIMOS_WindowsXP_64 = 71,
+- CIMOSType_CIMOS_WindowsXPEmbedded = 72,
+- CIMOSType_CIMOS_WindowsVista = 73,
+- CIMOSType_CIMOS_WindowsVista_64 = 74,
+- CIMOSType_CIMOS_WindowsEmbeddedforPointofService = 75,
+- CIMOSType_CIMOS_MicrosoftWindowsServer2008 = 76,
+- CIMOSType_CIMOS_MicrosoftWindowsServer2008_64 = 77,
+- CIMOSType_CIMOS_FreeBSD_64 = 78,
+- CIMOSType_CIMOS_RedHatEnterpriseLinux = 79,
+- CIMOSType_CIMOS_RedHatEnterpriseLinux_64 = 80,
+- CIMOSType_CIMOS_Solaris_64 = 81,
+- CIMOSType_CIMOS_SUSE = 82,
+- CIMOSType_CIMOS_SUSE_64 = 83,
+- CIMOSType_CIMOS_SLES = 84,
+- CIMOSType_CIMOS_SLES_64 = 85,
+- CIMOSType_CIMOS_NovellOES = 86,
+- CIMOSType_CIMOS_NovellLinuxDesktop = 87,
+- CIMOSType_CIMOS_SunJavaDesktopSystem = 88,
+- CIMOSType_CIMOS_Mandriva = 89,
+- CIMOSType_CIMOS_Mandriva_64 = 90,
+- CIMOSType_CIMOS_TurboLinux = 91,
+- CIMOSType_CIMOS_TurboLinux_64 = 92,
+- CIMOSType_CIMOS_Ubuntu = 93,
+- CIMOSType_CIMOS_Ubuntu_64 = 94,
+- CIMOSType_CIMOS_Debian = 95,
+- CIMOSType_CIMOS_Debian_64 = 96,
+- CIMOSType_CIMOS_Linux_2_4_x = 97,
+- CIMOSType_CIMOS_Linux_2_4_x_64 = 98,
+- CIMOSType_CIMOS_Linux_2_6_x = 99,
+- CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
+- CIMOSType_CIMOS_Linux_64 = 101,
+- CIMOSType_CIMOS_Other_64 = 102,
+- // types added with CIM 2.25.0 follow:
+- CIMOSType_CIMOS_WindowsServer2008R2 = 103,
+- CIMOSType_CIMOS_VMwareESXi = 104,
+- CIMOSType_CIMOS_Windows7 = 105,
+- CIMOSType_CIMOS_CentOS = 106,
+- CIMOSType_CIMOS_CentOS_64 = 107,
+- CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
+- CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
+- CIMOSType_CIMOS_eComStation = 110
+- // no new types added with CIM 2.26.0
++ CIMOSType_CIMOS_Unknown = 0,
++ CIMOSType_CIMOS_Other = 1,
++ CIMOSType_CIMOS_Other_64 = 2,
++ CIMOSType_CIMOS_gNewSense = 3,
++ CIMOSType_CIMOS_gNewSense_64 = 4,
++ CIMOSType_CIMOS_Dragora = 5,
++ CIMOSType_CIMOS_Dragora_64 = 6,
++ CIMOSType_CIMOS_Musix = 7,
++ CIMOSType_CIMOS_Musix_64 = 8,
++ CIMOSType_CIMOS_Trisquel = 9,
++ CIMOSType_CIMOS_Trisquel_64 = 10,
++ CIMOSType_CIMOS_Dynebolic = 11,
++ CIMOSType_CIMOS_Venenux = 12,
++ CIMOSType_CIMOS_GNU = 13,
++ CIMOSType_CIMOS_GNU_64 = 14,
++ CIMOSType_CIMOS_GNUHurd = 15,
++ CIMOSType_CIMOS_GNULinux = 16,
++ CIMOSType_CIMOS_GNULinux_64 = 17
+ };
+
+
+--- VirtualBox-4.1.18.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2012-06-20 10:09:01.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2012-07-26 15:32:55.309812685 -0300
+@@ -622,16 +622,16 @@
+ * Call the common device extension initializer.
+ */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_X86)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_AMD64)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26_x64;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_X86)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_AMD64)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24_x64;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64;
+ #else
+ # warning "huh? which arch + version is this?"
+- VBOXOSTYPE enmOsType = VBOXOSTYPE_Linux;
++ VBOXOSTYPE enmOsType = VBOXOSTYPE_GNULinux;
+ #endif
+ rc = VBoxGuestInitDevExt(&g_DevExt,
+ g_IOPortBase,
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-07 04:20:47 +0000