include/VBox/ostypes.h | 2 ++ src/VBox/Additions/linux/installer/vboxadd-x11.sh | 6 ++++++ src/VBox/Devices/VMMDev/VMMDev.cpp | 1 + src/VBox/Frontends/VirtualBox/VirtualBox2.qrc | 2 ++ src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc | 2 ++ src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc | 2 ++ src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc | 2 ++ src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp | 2 ++ src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp | 6 ++++-- src/VBox/Installer/linux/VBoxSysInfo.sh | 5 +++++ src/VBox/Installer/linux/distributions_rpm | 15 +++++++++++++++ src/VBox/Main/src-all/Global.cpp | 11 +++++++++++ src/VBox/Main/src-server/ApplianceImpl.cpp | 2 ++ src/VBox/Main/src-server/MachineImpl.cpp | 2 ++ src/VBox/Main/xml/Settings.cpp | 1 + 15 files changed, 59 insertions(+), 2 deletions(-) diff -Nurp VirtualBox-6.1.8.orig/include/VBox/ostypes.h VirtualBox-6.1.8/include/VBox/ostypes.h --- VirtualBox-6.1.8.orig/include/VBox/ostypes.h 2020-05-14 21:31:32.000000000 +0300 +++ VirtualBox-6.1.8/include/VBox/ostypes.h 2020-05-17 01:06:43.633787559 +0300 @@ -112,6 +112,8 @@ typedef enum VBOXOSTYPE VBOXOSTYPE_Xandros_x64 = 0x5D100, VBOXOSTYPE_Oracle = 0x5E000, VBOXOSTYPE_Oracle_x64 = 0x5E100, + VBOXOSTYPE_Mageia = 0x5F000, + VBOXOSTYPE_Mageia_x64 = 0x5F100, VBOXOSTYPE_FreeBSD = 0x60000, VBOXOSTYPE_FreeBSD_x64 = 0x60100, VBOXOSTYPE_OpenBSD = 0x61000, diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-6.1.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh --- VirtualBox-6.1.8.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2020-05-14 21:33:48.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2020-05-17 01:06:43.643788022 +0300 @@ -94,8 +94,14 @@ install_x11_startup_app() { x11_autostart="/etc/xdg/autostart" kde_autostart="/usr/share/autostart" redhat_dir=/etc/X11/Xsession.d + mageia_dir=/etc/X11/xinit.d mandriva_dir=/etc/X11/xinit.d debian_dir=/etc/X11/xinit/xinitrc.d + if [ -d "$mageia_dir" -a -w "$mageia_dir" -a -x "$mageia_dir" ] + then + install -m 0644 $app_src "$mageia_dir/$app_dest" + found=1 + fi if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ] then install -m 0644 $app_src "$mandriva_dir/$app_dest" diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Devices/VMMDev/VMMDev.cpp VirtualBox-6.1.8/src/VBox/Devices/VMMDev/VMMDev.cpp --- VirtualBox-6.1.8.orig/src/VBox/Devices/VMMDev/VMMDev.cpp 2020-05-14 21:39:36.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Devices/VMMDev/VMMDev.cpp 2020-05-17 01:06:43.647788207 +0300 @@ -200,6 +200,7 @@ static void vmmdevLogGuestOsInfo(VBoxGue case VBOXOSTYPE_OpenSUSE: pszOs = "openSUSE"; break; case VBOXOSTYPE_FedoraCore: pszOs = "Fedora"; break; case VBOXOSTYPE_Gentoo: pszOs = "Gentoo"; break; + case VBOXOSTYPE_Mageia: pszOs = "Mageia"; break; case VBOXOSTYPE_Mandriva: pszOs = "Mandriva"; break; case VBOXOSTYPE_RedHat: pszOs = "RedHat"; break; case VBOXOSTYPE_Turbolinux: pszOs = "TurboLinux"; break; diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp --- VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2020-05-14 21:40:35.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2020-05-17 01:06:43.647788207 +0300 @@ -326,6 +326,8 @@ UIIconPoolGeneral::UIIconPoolGeneral() m_guestOSTypeIconNames.insert("Fedora_64", ":/os_fedora_64.png"); m_guestOSTypeIconNames.insert("Gentoo", ":/os_gentoo.png"); m_guestOSTypeIconNames.insert("Gentoo_64", ":/os_gentoo_64.png"); + m_guestOSTypeIconNames.insert("Mageia", ":/os_mageia.png"); + m_guestOSTypeIconNames.insert("Mageia_64", ":/os_mageia_64.png"); m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png"); m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png"); m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png"); diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp --- VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2020-05-14 21:40:46.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2020-05-17 01:06:43.651788392 +0300 @@ -137,8 +137,10 @@ static const osTypePattern gs_OSTypePatt { QRegExp("Fe.*32", Qt::CaseInsensitive), "Fedora" }, { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" }, { QRegExp("((Gen)|(Sab)).*32", Qt::CaseInsensitive), "Gentoo" }, - { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" }, - { QRegExp("((Man)|(Mag)).*32", Qt::CaseInsensitive), "Mandriva" }, + { QRegExp("Mag.*64", Qt::CaseInsensitive), "Mageia_64" }, + { QRegExp("Mag", Qt::CaseInsensitive), "Mageia" }, + { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" }, + { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" }, { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, { QRegExp("((Red)|(rhel)|(cen)).*32", Qt::CaseInsensitive), "RedHat" }, { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" }, diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc --- VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2020-05-14 21:40:13.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2020-05-17 01:06:43.652788439 +0300 @@ -64,6 +64,8 @@ <file alias="os_linux_64.png">images/os_linux_64.png</file> <file alias="os_macosx.png">images/os_macosx.png</file> <file alias="os_macosx_64.png">images/os_macosx_64.png</file> + <file alias="os_mageia.png">images/os_mageia.png</file> + <file alias="os_mageia_64.png">images/os_mageia_64.png</file> <file alias="os_mandriva.png">images/os_mandriva.png</file> <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> <file alias="os_netbsd.png">images/os_netbsd.png</file> diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc --- VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2020-05-14 21:40:13.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2020-05-17 01:06:43.652788439 +0300 @@ -67,6 +67,8 @@ <file alias="os_linux_x2.png">images/x2/os_linux_x2.png</file> <file alias="os_macosx_64_x2.png">images/x2/os_macosx_64_x2.png</file> <file alias="os_macosx_x2.png">images/x2/os_macosx_x2.png</file> + <file alias="os_mageia_64_x2.png">images/x2/os_mageia_64_x2.png</file> + <file alias="os_mageia_x2.png">images/x2/os_mageia_x2.png</file> <file alias="os_mandriva_64_x2.png">images/x2/os_mandriva_64_x2.png</file> <file alias="os_mandriva_x2.png">images/x2/os_mandriva_x2.png</file> <file alias="os_netbsd_64_x2.png">images/x2/os_netbsd_64_x2.png</file> diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc --- VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2020-05-14 21:40:13.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2020-05-17 01:06:43.652788439 +0300 @@ -67,6 +67,8 @@ <file alias="os_linux_x3.png">images/x3/os_linux_x3.png</file> <file alias="os_macosx_64_x3.png">images/x3/os_macosx_64_x3.png</file> <file alias="os_macosx_x3.png">images/x3/os_macosx_x3.png</file> + <file alias="os_mageia_64_x3.png">images/x3/os_mageia_64_x3.png</file> + <file alias="os_mageia_x3.png">images/x3/os_mageia_x3.png</file> <file alias="os_mandriva_64_x3.png">images/x3/os_mandriva_64_x3.png</file> <file alias="os_mandriva_x3.png">images/x3/os_mandriva_x3.png</file> <file alias="os_netbsd_64_x3.png">images/x3/os_netbsd_64_x3.png</file> diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc --- VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2020-05-14 21:40:13.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2020-05-17 01:06:43.652788439 +0300 @@ -67,6 +67,8 @@ <file alias="os_linux_x4.png">images/x4/os_linux_x4.png</file> <file alias="os_macosx_64_x4.png">images/x4/os_macosx_64_x4.png</file> <file alias="os_macosx_x4.png">images/x4/os_macosx_x4.png</file> + <file alias="os_mageia_64_x4.png">images/x4/os_mageia_64_x4.png</file> + <file alias="os_mageia_x4.png">images/x4/os_mageia_x4.png</file> <file alias="os_mandriva_64_x4.png">images/x4/os_mandriva_64_x4.png</file> <file alias="os_mandriva_x4.png">images/x4/os_mandriva_x4.png</file> <file alias="os_netbsd_64_x4.png">images/x4/os_netbsd_64_x4.png</file> diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-6.1.8/src/VBox/Installer/linux/distributions_rpm --- VirtualBox-6.1.8.orig/src/VBox/Installer/linux/distributions_rpm 2020-05-14 21:40:56.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Installer/linux/distributions_rpm 2020-05-17 01:07:46.724709135 +0300 @@ -7,6 +7,21 @@ openSUSE114 = OPENSUSE_11_4 openSUSE113 = OPENSUSE_11_3 sles11.0 = SLES_11_0 sles10.1 = SLES_10_1 +mga15 = MAGEIA_15 +mga14 = MAGEIA_14 +mga13 = MAGEIA_13 +mga12 = MAGEIA_12 +mga11 = MAGEIA_11 +mga10 = MAGEIA_10 +mga9 = MAGEIA_9 +mga8 = MAGEIA_8 +mga7 = MAGEIA_7 +mga6 = MAGEIA_6 +mga5 = MAGEIA_5 +mga4 = MAGEIA_4 +mga3 = MAGEIA_3 +mga2 = MAGEIA_2 +mga1 = MAGEIA_1 mdv2011.0 = MANDRIVA_2011_0 fedora32 = FEDORA_32 fedora31 = FEDORA_31 diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-6.1.8/src/VBox/Installer/linux/VBoxSysInfo.sh --- VirtualBox-6.1.8.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2020-05-14 21:40:55.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Installer/linux/VBoxSysInfo.sh 2020-05-17 01:06:43.652788439 +0300 @@ -44,6 +44,11 @@ get_linux_info () { # Debian-based system release=`cat /etc/debian_version` print_linux_info "Debian" $release + elif [ -r /etc/mageia-release ] + then + # Mageia-based system + release=`cat /etc/mageia-release | sed -e 's/[A-Za-z ]* release //'` + print_linux_info "Mageia" $release elif [ -r /etc/mandriva-release ] then # Mandriva-based system diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-6.1.8/src/VBox/Main/src-all/Global.cpp --- VirtualBox-6.1.8.orig/src/VBox/Main/src-all/Global.cpp 2020-05-14 21:41:01.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Main/src-all/Global.cpp 2020-05-17 01:06:43.656788624 +0300 @@ -249,6 +249,17 @@ const Global::OSType Global::sOSTypes[] 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + { "Linux", "Linux", "Mageia", "Mageia (32-bit)", + VBOXOSTYPE_Mageia, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, + 1024, 16, 20 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + + { "Linux", "Linux", "Mageia_64", "Mageia (64-bit)", + VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC + | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, + 1024, 16, 20 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + { "Linux", "Linux", "Mandriva", "Mandriva (32-bit)", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-6.1.8/src/VBox/Main/src-server/ApplianceImpl.cpp --- VirtualBox-6.1.8.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2020-05-14 21:41:03.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2020-05-17 01:06:43.660788809 +0300 @@ -218,6 +218,7 @@ static const osTypePattern g_aOsTypesPat {"SUSE", VBOXOSTYPE_OpenSUSE}, {"Novell", VBOXOSTYPE_OpenSUSE}, {"Red Hat", VBOXOSTYPE_RedHat}, + {"Mageia", VBOXOSTYPE_Mageia}, {"Mandriva", VBOXOSTYPE_Mandriva}, {"Ubuntu", VBOXOSTYPE_Ubuntu}, {"Debian", VBOXOSTYPE_Debian}, @@ -254,6 +255,7 @@ static const osTypePattern g_aOsTypesPat {"SUSE", VBOXOSTYPE_OpenSUSE_x64}, {"Novell", VBOXOSTYPE_OpenSUSE_x64}, {"Red Hat", VBOXOSTYPE_RedHat_x64}, + {"Mageia", VBOXOSTYPE_Mageia_x64}, {"Mandriva", VBOXOSTYPE_Mandriva_x64}, {"Ubuntu", VBOXOSTYPE_Ubuntu_x64}, {"Debian", VBOXOSTYPE_Debian_x64}, diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Main/src-server/MachineImpl.cpp VirtualBox-6.1.8/src/VBox/Main/src-server/MachineImpl.cpp --- VirtualBox-6.1.8.orig/src/VBox/Main/src-server/MachineImpl.cpp 2020-05-14 21:41:04.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Main/src-server/MachineImpl.cpp 2020-05-17 01:06:43.662788902 +0300 @@ -1364,6 +1364,8 @@ HRESULT Machine::getEffectiveParavirtPro || mUserData->s.strOsType == "Gentoo_64" || mUserData->s.strOsType == "Mandriva" || mUserData->s.strOsType == "Mandriva_64" + || mUserData->s.strOsType == "Mageia" + || mUserData->s.strOsType == "Mageia_64" || mUserData->s.strOsType == "OpenSUSE" || mUserData->s.strOsType == "OpenSUSE_64" || mUserData->s.strOsType == "Oracle" diff -Nurp VirtualBox-6.1.8.orig/src/VBox/Main/xml/Settings.cpp VirtualBox-6.1.8/src/VBox/Main/xml/Settings.cpp --- VirtualBox-6.1.8.orig/src/VBox/Main/xml/Settings.cpp 2020-05-14 21:41:07.000000000 +0300 +++ VirtualBox-6.1.8/src/VBox/Main/xml/Settings.cpp 2020-05-17 01:06:43.663788948 +0300 @@ -5672,6 +5672,7 @@ const struct { { "opensuse", "OpenSUSE" }, { "fedoracore", "Fedora" }, { "gentoo", "Gentoo" }, + { "mageia", "Mageia" }, { "mandriva", "Mandriva" }, { "redhat", "RedHat" }, { "ubuntu", "Ubuntu" },