--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300 +++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-09-19 01:30:56.328334913 -0300 @@ -44,99 +44,111 @@ static const osTypePattern gs_OSTypePattern[] = { - /* DOS: */ - { QRegExp("DOS", Qt::CaseInsensitive), "DOS" }, + + /* 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" }, + { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "GNULinux" }, + + /* 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" }, + { QRegExp("Arc.*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("Arc", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("Deb.*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("Deb", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("Fe.*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("Fe", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("Tur.*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("Tur", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("Ub.*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("Ub", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("Xa.*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("Xa", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "GNULinux_64" }, + { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("Knoppix", Qt::CaseInsensitive), "GNULinux" }, + { QRegExp("Dsl", Qt::CaseInsensitive), "GNULinux" }, - /* 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("So.*11", Qt::CaseInsensitive), "Solaris11_64" }, - { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" }, - { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(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)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" }, - { QRegExp("((Man)|(Mag))", 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("Knoppix", Qt::CaseInsensitive), "Linux26" }, - { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, - { 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" }, - - /* 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" }, + /* Other */ { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, + { QRegExp("DOS", Qt::CaseInsensitive), "Other" }, + { QRegExp("Wi.*98", Qt::CaseInsensitive), "Other" }, + { QRegExp("Wi.*95", Qt::CaseInsensitive), "Other" }, + { QRegExp("Wi.*Me", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "Other" }, + { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "Other" }, + { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Other" }, + { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "Other" }, + { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Other" }, + { QRegExp("Wi.*3", Qt::CaseInsensitive), "Other" }, + { QRegExp("Wi", Qt::CaseInsensitive), "Other" }, + { QRegExp("So.*11", Qt::CaseInsensitive), "Other" }, + { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "Other" }, + { QRegExp("So.*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("So", Qt::CaseInsensitive), "Other" }, + { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "Other" }, + { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "Other" }, + { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "Other" }, + { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "Other" }, + { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "Other" }, + { QRegExp("L4", Qt::CaseInsensitive), "Other" }, + { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "Other" }, + { QRegExp("Op.*B.*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("Op.*B", Qt::CaseInsensitive), "Other" }, + { QRegExp("Ne.*B.*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("Ne.*B", Qt::CaseInsensitive), "Other" }, + { QRegExp("QN", Qt::CaseInsensitive), "Other" }, + { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "Other" }, + { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "Other" }, + { QRegExp("Net", Qt::CaseInsensitive), "Other" }, + { QRegExp("Rocki", Qt::CaseInsensitive), "Other" }, }; UIWizardNewVMPage1::UIWizardNewVMPage1(const QString &strGroup) --- 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 @@ Other - DOS - Windows31 - Windows95 - Windows98 - WindowsMe - WindowsNT4 - Windows2000 - WindowsXP - Windows2003 - WindowsVista - Windows2008 - OS2Warp3 - OS2Warp4 - OS2Warp45 - OS2eCS - Linux22 - Linux24 - Linux26 - ArchLinux - Debian - OpenSUSE - Fedora - Gentoo - Mandriva - RedHat - Ubuntu - Xandros - FreeBSD - OpenBSD - NetBSD - Netware - Solaris - OpenSolaris - L4 + GNU + GNUHurd + GNULinux + Parabola + gNewSense + Blag + Dragora + Ututo + Musix + Trisquel + Dynebolic + Venenux --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 01:52:44.572133271 -0300 +++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 01:58:47.789130085 -0300 @@ -1,75 +1,27 @@ - images/os_archlinux.png - images/os_archlinux_64.png - images/os_debian.png - images/os_debian_64.png - images/os_dos.png - images/os_fedora.png - images/os_fedora_64.png - images/os_freebsd.png - images/os_freebsd_64.png - images/os_gentoo.png - images/os_gentoo_64.png - images/os_jrockitve.png - images/os_l4.png - images/os_linux_other.png - images/os_linux22.png - images/os_linux24.png - images/os_linux24_64.png - images/os_linux26.png - images/os_linux26_64.png - images/os_mandriva.png - images/os_mandriva_64.png - images/os_netbsd.png - images/os_netbsd_64.png - images/os_netware.png - images/os_openbsd.png - images/os_openbsd_64.png - images/os_oraclesolaris.png - images/os_oraclesolaris_64.png - images/os_opensuse.png - images/os_opensuse_64.png - images/os_os2_other.png - images/os_os2ecs.png - images/os_os2warp3.png - images/os_os2warp4.png - images/os_os2warp45.png images/os_other.png - images/os_qnx.png - images/os_redhat.png - images/os_redhat_64.png - images/os_turbolinux.png - images/os_turbolinux_64.png - images/os_solaris.png - images/os_solaris_64.png - images/os_ubuntu.png - images/os_ubuntu_64.png - images/os_win_other.png - images/os_win2k.png - images/os_win2k3.png - images/os_win2k3_64.png - images/os_win2k8.png - images/os_win2k8_64.png - images/os_win31.png - images/os_win7.png - images/os_win7_64.png - images/os_win8.png - images/os_win8_64.png - images/os_win95.png - images/os_win98.png - images/os_winme.png - images/os_winnt4.png - images/os_winvista.png - images/os_winvista_64.png - images/os_winxp.png - images/os_winxp_64.png - images/os_xandros.png - images/os_xandros_64.png - images/os_oracle.png - images/os_oracle_64.png - images/os_macosx.png - images/os_macosx_64.png + images/os_parabola.png + images/os_parabola_64.png + images/os_gnewsense.png + images/os_gnewsense_64.png + images/os_blag.png + images/os_blag_64.png + images/os_ututo.png + images/os_ututo_64.png + images/os_gnu.png + images/os_gnu_64.png + images/os_gnuhurd.png + images/os_gnulinux.png + images/os_gnulinux_64.png + images/os_musix.png + images/os_musix_64.png + images/os_dragora.png + images/os_dragora_64.png + images/os_dynebolic.png + images/os_venenux.png + images/os_trisquel.png + images/os_trisquel_64.png images/hd_16px.png images/hd_disabled_16px.png images/hd_32px.png --- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp 2012-09-08 06:36:02.000000000 -0300 +++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-09-19 03:33:50.143066084 -0300 @@ -29,296 +29,94 @@ /* NOTE1: we assume that unknown is always the first entry! * NOTE2: please use powers of 2 when specifying the size of harddisks since * '2GB' looks better than '1.95GB' (= 2000MB) */ - { "Other", "Other", "Other", "Other/Unknown", + { "Other", "Other", "Other", "Other/Unknown", 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", "Windows31", "Windows 3.1", - VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY, - 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Windows", "Microsoft Windows", "Windows95", "Windows 95", - VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY, - 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Windows", "Microsoft Windows", "Windows98", "Windows 98", - VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY, - 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Windows", "Microsoft Windows", "WindowsMe", "Windows ME", - VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET, - 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Windows", "Microsoft Windows", "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_SB16 }, - { "Windows", "Microsoft Windows", "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", "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", "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", "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", "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", "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", "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", "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", "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", "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", "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", "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", "Windows8_64", "Windows 8 (64 bit)", - VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, - { "Windows", "Microsoft Windows", "Windows2012_64", "Windows 2012 (64 bit)", - VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, - { "Windows", "Microsoft Windows", "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", "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", "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", "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", "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", "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", "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", "Linux26", "Linux 2.6", - VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "Linux26_64", "Linux 2.6 (64 bit)", - VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "ArchLinux", "Arch Linux", - VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "ArchLinux_64", "Arch Linux (64 bit)", - VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "Debian", "Debian", - VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "Debian_64", "Debian (64 bit)", - VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "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", "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", "Fedora", "Fedora", - VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "Fedora_64", "Fedora (64 bit)", - VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "Gentoo", "Gentoo", - VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "Gentoo_64", "Gentoo (64 bit)", - VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "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", "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", "RedHat", "Red Hat", - VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, - 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + { "GNU/Linux", "GNU/Linux", "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", "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", "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", "Turbolinux", "Turbolinux", - VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "Turbolinux_64", "Turbolinux (64 bit)", - VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "Ubuntu", "Ubuntu", - VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, + { "GNU/Linux", "GNU/Linux", "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", "Ubuntu_64", "Ubuntu (64 bit)", - VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + { "GNU/Linux", "GNU/Linux", "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", "Xandros", "Xandros", - VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, - 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + { "GNU/Linux", "GNU/Linux", "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", "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, + { "GNU/Linux", "GNU/Linux", "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", "Oracle", "Oracle", - VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, - 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle_64", "Oracle (64 bit)", - VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, - 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "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", "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", "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", "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", "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 }, - { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64 bit)", - VBOXOSTYPE_Solaris11_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", "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", "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", "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", "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", "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", "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", "OS2Warp3", "OS/2 Warp 3", - VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, - 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4", - VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, - 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5", - VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, - 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2eCS", "eComStation", - VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, - 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2", "Other OS/2", - VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, - 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "MacOS", "Mac OS X", "MacOS", "Mac OS X", - VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, - 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, - StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA }, - { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)", - VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, - 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, - StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA }, - { "Other", "Other", "DOS", "DOS", - VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, - 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Other", "Other", "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", "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", "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", "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 }, }; uint32_t Global::cOSTypes = RT_ELEMENTS(Global::sOSTypes); --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-04 09:48:45.000000000 -0300 +++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-19 02:10:41.293426675 -0300 @@ -4283,76 +4283,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"}, - {"Solaris11_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.2.0.orig/include/VBox/ostypes.h 2012-09-08 06:35:56.000000000 -0300 +++ VirtualBox-4.2.0/include/VBox/ostypes.h 2012-09-19 02:20:24.640916587 -0300 @@ -43,79 +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_Win2k12_x64 = 0x39100, - 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_Solaris11_x64 = 0x82100, - 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. */ @@ -131,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.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-08-03 09:28:30.000000000 -0300 +++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-09-19 04:40:38.226412294 -0300 @@ -50,94 +50,33 @@ g_osTypes[] = { { ovf::CIMOSType_CIMOS_Unknown, VBOXOSTYPE_Unknown }, - { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2 }, - { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp3 }, - { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp4 }, - { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp45 }, - { ovf::CIMOSType_CIMOS_MSDOS, VBOXOSTYPE_DOS }, - { ovf::CIMOSType_CIMOS_WIN3x, VBOXOSTYPE_Win31 }, - { ovf::CIMOSType_CIMOS_WIN95, VBOXOSTYPE_Win95 }, - { ovf::CIMOSType_CIMOS_WIN98, VBOXOSTYPE_Win98 }, - { ovf::CIMOSType_CIMOS_WINNT, VBOXOSTYPE_WinNT }, - { ovf::CIMOSType_CIMOS_WINNT, VBOXOSTYPE_WinNT4 }, - { ovf::CIMOSType_CIMOS_NetWare, VBOXOSTYPE_Netware }, - { ovf::CIMOSType_CIMOS_NovellOES, VBOXOSTYPE_Netware }, - { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_Solaris }, - { ovf::CIMOSType_CIMOS_SunOS, VBOXOSTYPE_Solaris }, - { ovf::CIMOSType_CIMOS_FreeBSD, VBOXOSTYPE_FreeBSD }, - { ovf::CIMOSType_CIMOS_NetBSD, VBOXOSTYPE_NetBSD }, - { ovf::CIMOSType_CIMOS_QNX, VBOXOSTYPE_QNX }, - { ovf::CIMOSType_CIMOS_Windows2000, VBOXOSTYPE_Win2k }, - { ovf::CIMOSType_CIMOS_WindowsMe, VBOXOSTYPE_WinMe }, - { ovf::CIMOSType_CIMOS_OpenBSD, VBOXOSTYPE_OpenBSD }, - { ovf::CIMOSType_CIMOS_WindowsXP, VBOXOSTYPE_WinXP }, - { ovf::CIMOSType_CIMOS_WindowsXPEmbedded, VBOXOSTYPE_WinXP }, - { ovf::CIMOSType_CIMOS_WindowsEmbeddedforPointofService, VBOXOSTYPE_WinXP }, - { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003, VBOXOSTYPE_Win2k3 }, - { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003_64, VBOXOSTYPE_Win2k3_x64 }, - { ovf::CIMOSType_CIMOS_WindowsXP_64, VBOXOSTYPE_WinXP_x64 }, - { ovf::CIMOSType_CIMOS_WindowsVista, VBOXOSTYPE_WinVista }, - { ovf::CIMOSType_CIMOS_WindowsVista_64, VBOXOSTYPE_WinVista_x64 }, - { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008, VBOXOSTYPE_Win2k8 }, - { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64, VBOXOSTYPE_Win2k8_x64 }, - { ovf::CIMOSType_CIMOS_FreeBSD_64, VBOXOSTYPE_FreeBSD_x64 }, - { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, - { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this - - // Linuxes - { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat }, - { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 }, - { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 }, - { ovf::CIMOSType_CIMOS_SUSE, VBOXOSTYPE_OpenSUSE }, - { ovf::CIMOSType_CIMOS_SLES, VBOXOSTYPE_OpenSUSE }, - { ovf::CIMOSType_CIMOS_NovellLinuxDesktop, VBOXOSTYPE_OpenSUSE }, - { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_x64 }, - { ovf::CIMOSType_CIMOS_SLES_64, VBOXOSTYPE_OpenSUSE_x64 }, - { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux }, - { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux22 }, - { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, VBOXOSTYPE_Linux }, - { ovf::CIMOSType_CIMOS_TurboLinux, VBOXOSTYPE_Turbolinux }, - { ovf::CIMOSType_CIMOS_TurboLinux_64, VBOXOSTYPE_Turbolinux_x64 }, - { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva }, - { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 }, - { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu }, - { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_x64 }, - { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian }, - { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_x64 }, - { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 }, - { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 }, - { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Linux26 }, - { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 }, - { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 }, - - // types that we have support for but CIM doesn't - { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux }, - { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 }, - { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore }, - { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_FedoraCore_x64 }, - { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Gentoo }, - { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Gentoo_x64 }, - { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Xandros }, - { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 }, - { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris }, - { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_OpenSolaris_x64 }, - - // types added with CIM 2.25.0 follow: - { ovf::CIMOSType_CIMOS_WindowsServer2008R2, VBOXOSTYPE_Win2k8 }, // duplicate, see above -// { ovf::CIMOSType_CIMOS_VMwareESXi = 104, // we can't run ESX in a VM - { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7 }, - { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7_x64 }, // there is no CIM 64-bit type for this - { ovf::CIMOSType_CIMOS_CentOS, VBOXOSTYPE_RedHat }, - { ovf::CIMOSType_CIMOS_CentOS_64, VBOXOSTYPE_RedHat_x64 }, - { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux, VBOXOSTYPE_Oracle }, - { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux_64, VBOXOSTYPE_Oracle_x64 }, - { ovf::CIMOSType_CIMOS_eComStation, VBOXOSTYPE_ECS } - - // there are no CIM types for these, so these turn to "other" on export: - // VBOXOSTYPE_OpenBSD - // VBOXOSTYPE_OpenBSD_x64 - // VBOXOSTYPE_NetBSD - // VBOXOSTYPE_NetBSD_x64 + + // Custom OS + { ovf::CIMOSType_CIMOS_GNU, VBOXOSTYPE_GNU }, + { ovf::CIMOSType_CIMOS_GNU_64, VBOXOSTYPE_GNU_x64 }, + { ovf::CIMOSType_CIMOS_GNUHurd, VBOXOSTYPE_GNUHurd }, + { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_GNULinux }, + { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_GNULinux_x64 }, + + // GNU/Linux free distros + { ovf::CIMOSType_CIMOS_gNewSense, VBOXOSTYPE_gNewSense }, + { ovf::CIMOSType_CIMOS_gNewSense_64, VBOXOSTYPE_gNewSense_x64 }, + { ovf::CIMOSType_CIMOS_Dragora, VBOXOSTYPE_Dragora }, + { ovf::CIMOSType_CIMOS_Dragora_64, VBOXOSTYPE_Dragora_x64 }, + { ovf::CIMOSType_CIMOS_Musix, VBOXOSTYPE_Musix }, + { ovf::CIMOSType_CIMOS_Musix_64, VBOXOSTYPE_Musix_x64 }, + { ovf::CIMOSType_CIMOS_Trisquel, VBOXOSTYPE_Trisquel }, + { ovf::CIMOSType_CIMOS_Trisquel_64, VBOXOSTYPE_Trisquel_x64 }, + { ovf::CIMOSType_CIMOS_Dynebolic, VBOXOSTYPE_Dynebolic }, + { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux }, + + // GNU/Linux free distros that we have support for but CIM doesn't + { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_Parabola }, + { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_Parabola_x64 }, + { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_Blag }, + { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_Blag_x64 }, + { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_Ututo }, + { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_Ututo_x64 }, }; @@ -151,53 +90,32 @@ /* These are the 32-Bit ones. They are sorted by priority. */ static const osTypePattern g_osTypesPattern[] = { - {"Windows NT", VBOXOSTYPE_WinNT4}, - {"Windows XP", VBOXOSTYPE_WinXP}, - {"Windows 2000", VBOXOSTYPE_Win2k}, - {"Windows 2003", VBOXOSTYPE_Win2k3}, - {"Windows Vista", VBOXOSTYPE_WinVista}, - {"Windows 2008", VBOXOSTYPE_Win2k8}, - {"SUSE", VBOXOSTYPE_OpenSUSE}, - {"Novell", VBOXOSTYPE_OpenSUSE}, - {"Red Hat", VBOXOSTYPE_RedHat}, - {"Mandriva", VBOXOSTYPE_Mandriva}, - {"Ubuntu", VBOXOSTYPE_Ubuntu}, - {"Debian", VBOXOSTYPE_Debian}, - {"QNX", VBOXOSTYPE_QNX}, - {"Linux 2.4", VBOXOSTYPE_Linux24}, - {"Linux 2.6", VBOXOSTYPE_Linux26}, - {"Linux", VBOXOSTYPE_Linux}, - {"OpenSolaris", VBOXOSTYPE_OpenSolaris}, - {"Solaris", VBOXOSTYPE_OpenSolaris}, - {"FreeBSD", VBOXOSTYPE_FreeBSD}, - {"NetBSD", VBOXOSTYPE_NetBSD}, - {"Windows 95", VBOXOSTYPE_Win95}, - {"Windows 98", VBOXOSTYPE_Win98}, - {"Windows Me", VBOXOSTYPE_WinMe}, - {"Windows 3.", VBOXOSTYPE_Win31}, - {"DOS", VBOXOSTYPE_DOS}, - {"OS2", VBOXOSTYPE_OS2} + {"Parabola GNU/Linux-libre", VBOXOSTYPE_Parabola}, + {"gNewSense", VBOXOSTYPE_gNewSense}, + {"Blag Linux and GNU", VBOXOSTYPE_Blag}, + {"Dragora", VBOXOSTYPE_Dragora}, + {"Ututo XS", VBOXOSTYPE_Ututo}, + {"Musix", VBOXOSTYPE_Musix}, + {"Trisquel", VBOXOSTYPE_Trisquel}, + {"Dyne:bolic", VBOXOSTYPE_Dynebolic}, + {"Venenux", VBOXOSTYPE_Venenux}, + {"GNU", VBOXOSTYPE_GNU}, + {"GNU-Hurd", VBOXOSTYPE_GNUHurd}, + {"GNU/Linux", VBOXOSTYPE_GNULinux}, }; /* These are the 64-Bit ones. They are sorted by priority. */ static const osTypePattern g_osTypesPattern64[] = { - {"Windows XP", VBOXOSTYPE_WinXP_x64}, - {"Windows 2003", VBOXOSTYPE_Win2k3_x64}, - {"Windows Vista", VBOXOSTYPE_WinVista_x64}, - {"Windows 2008", VBOXOSTYPE_Win2k8_x64}, - {"SUSE", VBOXOSTYPE_OpenSUSE_x64}, - {"Novell", VBOXOSTYPE_OpenSUSE_x64}, - {"Red Hat", VBOXOSTYPE_RedHat_x64}, - {"Mandriva", VBOXOSTYPE_Mandriva_x64}, - {"Ubuntu", VBOXOSTYPE_Ubuntu_x64}, - {"Debian", VBOXOSTYPE_Debian_x64}, - {"Linux 2.4", VBOXOSTYPE_Linux24_x64}, - {"Linux 2.6", VBOXOSTYPE_Linux26_x64}, - {"Linux", VBOXOSTYPE_Linux26_x64}, - {"OpenSolaris", VBOXOSTYPE_OpenSolaris_x64}, - {"Solaris", VBOXOSTYPE_OpenSolaris_x64}, - {"FreeBSD", VBOXOSTYPE_FreeBSD_x64}, + {"Parabola GNU/Linux-libre", VBOXOSTYPE_Parabola_x64}, + {"gNewSense", VBOXOSTYPE_gNewSense_x64}, + {"Blag Linux and GNU", VBOXOSTYPE_Blag_x64}, + {"Dragora", VBOXOSTYPE_Dragora_x64}, + {"Ututo XS", VBOXOSTYPE_Ututo_x64}, + {"Musix", VBOXOSTYPE_Musix_x64}, + {"Trisquel", VBOXOSTYPE_Trisquel_x64}, + {"GNU", VBOXOSTYPE_GNU_x64}, + {"GNU/Linux", VBOXOSTYPE_GNULinux_x64}, }; /** --- 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, --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-07-18 05:58:09.000000000 -0300 +++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-09-18 22:43:54.956086896 -0300 @@ -141,7 +141,7 @@ #ifdef VBOX_WITH_VIDEOHWACCEL /* Check if 2D video acceleration supported by the guest OS type: */ QString strguestOSTypeFamily = m_guestOSType.GetFamilyId(); - m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows"; + m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Other"; #endif /* VBOX_WITH_VIDEOHWACCEL */ #ifdef VBOX_WITH_CRHGSMI /* Check if WDDM mode supported by the guest OS type: */