diff -Naur virtualbox-4.1.51_svn40321/include/VBox/ostypes.h virtualbox-4.1.51_svn40321-magellan/include/VBox/ostypes.h --- virtualbox-4.1.51_svn40321/include/VBox/ostypes.h 2012-03-03 03:37:57.000000000 +0100 +++ virtualbox-4.1.51_svn40321-magellan/include/VBox/ostypes.h 2012-03-03 04:02:00.442982386 +0100 @@ -98,6 +98,8 @@ VBOXOSTYPE_Xandros_x64 = 0x5D100, VBOXOSTYPE_Oracle = 0x5E000, VBOXOSTYPE_Oracle_x64 = 0x5E100, + VBOXOSTYPE_Magellan = 0x5F000, + VBOXOSTYPE_Magellan_x64 = 0x5F100, VBOXOSTYPE_FreeBSD = 0x60000, VBOXOSTYPE_FreeBSD_x64 = 0x60100, VBOXOSTYPE_OpenBSD = 0x61000, diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp --- virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-03-03 03:38:29.000000000 +0100 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-03-03 04:02:41.941982386 +0100 @@ -4907,6 +4907,8 @@ {"Fedora_64", ":/os_fedora_64.png"}, {"Gentoo", ":/os_gentoo.png"}, {"Gentoo_64", ":/os_gentoo_64.png"}, + {"Magellan", ":/os_magellan.png"}, + {"Magellan_64", ":/os_magellan_64.png"}, {"Mandriva", ":/os_mandriva.png"}, {"Mandriva_64", ":/os_mandriva_64.png"}, {"RedHat", ":/os_redhat.png"}, diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp --- virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2012-03-03 03:38:29.000000000 +0100 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2012-03-03 04:03:45.422982387 +0100 @@ -199,10 +199,10 @@ if (xpIndex != -1) mCbType->setCurrentIndex (xpIndex); } - /* Or select Ubuntu item for Linux family as default */ + /* Or select Magellan item for Linux family as default */ else if (familyId == "Linux") { - int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID); + int ubIndex = mCbType->findData ("Magellan", RoleTypeID); if (ubIndex != -1) mCbType->setCurrentIndex (ubIndex); } diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp --- virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-03-03 03:38:28.000000000 +0100 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-03-03 04:04:50.962982386 +0100 @@ -100,6 +100,8 @@ { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" }, { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" }, { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" }, + { QRegExp("Mage.*64", Qt::CaseInsensitive), "Magellan_64" }, + { QRegExp("Mage", Qt::CaseInsensitive), "Magellan" }, { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" }, { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" }, { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc --- virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-03-03 03:38:27.000000000 +0100 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-03-03 04:05:30.246982386 +0100 @@ -11,6 +11,8 @@ images/os_freebsd_64.png images/os_gentoo.png images/os_gentoo_64.png + images/os_magellan.png + images/os_magellan_64.png images/os_jrockitve.png images/os_l4.png images/os_linux_other.png diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Main/src-all/Global.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/src-all/Global.cpp --- virtualbox-4.1.51_svn40321/src/VBox/Main/src-all/Global.cpp 2012-03-03 03:38:18.000000000 +0100 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/src-all/Global.cpp 2012-03-03 04:08:23.163982385 +0100 @@ -169,6 +169,14 @@ VBOXOSTYPE_Gentoo_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", "Magellan", "Magellan Linux", + VBOXOSTYPE_Magellan, 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", "Magellan_64", "Magellan Linux (64 bit)", + VBOXOSTYPE_Magellan_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, diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Main/src-server/ApplianceImpl.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp --- virtualbox-4.1.51_svn40321/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-03-03 03:38:18.000000000 +0100 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-03-03 04:09:15.658982387 +0100 @@ -117,6 +117,8 @@ { 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_Magellan }, + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Magellan_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 }, diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Main/xml/SettingsConverter.xsl virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/xml/SettingsConverter.xsl --- virtualbox-4.1.51_svn40321/src/VBox/Main/xml/SettingsConverter.xsl 2012-03-03 03:38:17.000000000 +0100 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/xml/SettingsConverter.xsl 2012-03-03 04:09:50.053982383 +0100 @@ -752,6 +752,7 @@ OpenSUSE Fedora Gentoo + Magellan Mandriva RedHat Ubuntu diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Main/xml/Settings.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/xml/Settings.cpp --- virtualbox-4.1.51_svn40321/src/VBox/Main/xml/Settings.cpp 2012-03-03 03:38:17.000000000 +0100 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/xml/Settings.cpp 2012-03-03 04:10:19.033982386 +0100 @@ -3261,6 +3261,7 @@ { "opensuse", "OpenSUSE" }, { "fedoracore", "Fedora" }, { "gentoo", "Gentoo" }, + { "magellan", "Magellan" }, { "mandriva", "Mandriva" }, { "redhat", "RedHat" }, { "ubuntu", "Ubuntu" },