diff -Naur VirtualBox-4.2.6/include/VBox/ostypes.h VirtualBox-4.2.6-magellan/include/VBox/ostypes.h --- VirtualBox-4.2.6/include/VBox/ostypes.h 2012-12-19 18:24:38.000000000 +0000 +++ VirtualBox-4.2.6-magellan/include/VBox/ostypes.h 2013-01-30 16:05:47.711458256 +0000 @@ -99,6 +99,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.2.6/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp --- VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-12-19 18:26:55.000000000 +0000 +++ VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2013-01-30 16:06:36.489469866 +0000 @@ -4351,6 +4351,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.2.6/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp --- VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp 2012-12-19 18:27:00.000000000 +0000 +++ VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp 2013-01-30 16:23:32.900737354 +0000 @@ -200,12 +200,12 @@ if (iIndexWinXP != -1) m_pTypeCombo->setCurrentIndex(iIndexWinXP); } - /* Or select Ubuntu item for Linux family as default: */ + /* Or select Magellan item for Linux family as default: */ else if (strFamilyId == "Linux") { - int iIndexUbuntu = m_pTypeCombo->findData("Ubuntu", TypeID); - if (iIndexUbuntu != -1) - m_pTypeCombo->setCurrentIndex(iIndexUbuntu); + int iIndexMagellan = m_pTypeCombo->findData("Magellan", TypeID); + if (iIndexMagellan != -1) + m_pTypeCombo->setCurrentIndex(iIndexMagellan); } /* Else simply select the first one present: */ else m_pTypeCombo->setCurrentIndex(0); diff -Naur VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp --- VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-12-19 18:27:01.000000000 +0000 +++ VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2013-01-30 16:24:53.605756719 +0000 @@ -102,6 +102,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.2.6/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc --- VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-12-19 18:26:50.000000000 +0000 +++ VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2013-01-30 16:25:48.518770474 +0000 @@ -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.2.6/src/VBox/Main/src-all/Global.cpp VirtualBox-4.2.6-magellan/src/VBox/Main/src-all/Global.cpp --- VirtualBox-4.2.6/src/VBox/Main/src-all/Global.cpp 2012-12-19 18:27:15.000000000 +0000 +++ VirtualBox-4.2.6-magellan/src/VBox/Main/src-all/Global.cpp 2013-01-30 16:31:32.613852738 +0000 @@ -173,6 +173,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.2.6/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-4.2.6-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp --- VirtualBox-4.2.6/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-12-19 18:27:16.000000000 +0000 +++ VirtualBox-4.2.6-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp 2013-01-30 16:32:59.495875377 +0000 @@ -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.2.6/src/VBox/Main/xml/SettingsConverter.xsl VirtualBox-4.2.6-magellan/src/VBox/Main/xml/SettingsConverter.xsl --- VirtualBox-4.2.6/src/VBox/Main/xml/SettingsConverter.xsl 2012-12-19 18:27:19.000000000 +0000 +++ VirtualBox-4.2.6-magellan/src/VBox/Main/xml/SettingsConverter.xsl 2013-01-30 16:34:13.537894513 +0000 @@ -752,6 +752,7 @@ OpenSUSE Fedora Gentoo + Magellan Mandriva RedHat Ubuntu diff -Naur VirtualBox-4.2.6/src/VBox/Main/xml/Settings.cpp VirtualBox-4.2.6-magellan/src/VBox/Main/xml/Settings.cpp --- VirtualBox-4.2.6/src/VBox/Main/xml/Settings.cpp 2012-12-19 18:27:19.000000000 +0000 +++ VirtualBox-4.2.6-magellan/src/VBox/Main/xml/Settings.cpp 2013-01-30 16:34:39.778901651 +0000 @@ -3395,6 +3395,7 @@ { "opensuse", "OpenSUSE" }, { "fedoracore", "Fedora" }, { "gentoo", "Gentoo" }, + { "magellan", "Magellan" }, { "mandriva", "Mandriva" }, { "redhat", "RedHat" }, { "ubuntu", "Ubuntu" },