diff -Naur VirtualBox-4.0.10_OSE/include/VBox/ostypes.h VirtualBox-4.0.10_OSE-magellan/include/VBox/ostypes.h --- VirtualBox-4.0.10_OSE/include/VBox/ostypes.h 2011-06-27 15:58:32.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/include/VBox/ostypes.h 2011-06-30 22:10:22.000000000 +0200 @@ -96,6 +96,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.0.10_OSE/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp VirtualBox-4.0.10_OSE-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp --- VirtualBox-4.0.10_OSE/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2011-06-27 16:01:51.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2011-06-30 22:23:23.000000000 +0200 @@ -4914,6 +4914,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.0.10_OSE/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp VirtualBox-4.0.10_OSE-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp --- VirtualBox-4.0.10_OSE/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2011-06-27 16:01:53.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2011-06-30 22:12:07.000000000 +0200 @@ -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.0.10_OSE/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp VirtualBox-4.0.10_OSE-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp --- VirtualBox-4.0.10_OSE/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2011-06-27 16:01:53.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2011-06-30 22:13:00.000000000 +0200 @@ -93,6 +93,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.*64", Qt::CaseInsensitive), "Mandriva_64" }, { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" }, { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, diff -Naur VirtualBox-4.0.10_OSE/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-4.0.10_OSE-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc --- VirtualBox-4.0.10_OSE/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2011-06-27 16:01:48.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2011-06-30 22:13:32.000000000 +0200 @@ -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.0.10_OSE/src/VBox/Main/src-all/Global.cpp VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/src-all/Global.cpp --- VirtualBox-4.0.10_OSE/src/VBox/Main/src-all/Global.cpp 2011-06-27 16:02:02.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/src-all/Global.cpp 2011-06-30 22:18:24.000000000 +0200 @@ -163,6 +163,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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_Mandriva, "Mandriva", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, diff -Naur VirtualBox-4.0.10_OSE/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp --- VirtualBox-4.0.10_OSE/src/VBox/Main/src-server/ApplianceImpl.cpp 2011-06-27 16:02:03.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp 2011-06-30 22:19:20.000000000 +0200 @@ -116,6 +116,8 @@ { 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_Magellan }, + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Magellan_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 }, diff -Naur VirtualBox-4.0.10_OSE/src/VBox/Main/xml/SettingsConverter.xsl VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/xml/SettingsConverter.xsl --- VirtualBox-4.0.10_OSE/src/VBox/Main/xml/SettingsConverter.xsl 2011-06-27 16:02:06.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/xml/SettingsConverter.xsl 2011-06-30 22:14:48.000000000 +0200 @@ -752,6 +752,7 @@ OpenSUSE Fedora Gentoo + Magellan Mandriva RedHat Ubuntu diff -Naur VirtualBox-4.0.10_OSE/src/VBox/Main/xml/Settings.cpp VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/xml/Settings.cpp --- VirtualBox-4.0.10_OSE/src/VBox/Main/xml/Settings.cpp 2011-06-27 16:02:06.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/xml/Settings.cpp 2011-06-30 22:15:14.000000000 +0200 @@ -3150,6 +3150,7 @@ { "opensuse", "OpenSUSE" }, { "fedoracore", "Fedora" }, { "gentoo", "Gentoo" }, + { "magellan", "Magellan" }, { "mandriva", "Mandriva" }, { "redhat", "RedHat" }, { "ubuntu", "Ubuntu" }, diff -Naur VirtualBox-4.0.10_OSE/src/VBox/Main/xml/VirtualBox-settings-common.xsd VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/xml/VirtualBox-settings-common.xsd --- VirtualBox-4.0.10_OSE/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2011-06-27 16:02:06.000000000 +0200 +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2011-06-30 22:15:38.000000000 +0200 @@ -177,6 +177,8 @@ + +