| 1 |
--- VirtualBox-4.3.8/include/VBox/ostypes.h.0013 2014-02-26 00:59:48.000000000 +0800 |
| 2 |
+++ VirtualBox-4.3.8/include/VBox/ostypes.h 2014-02-26 07:19:43.140803196 +0800 |
| 3 |
@@ -103,6 +103,8 @@ |
| 4 |
VBOXOSTYPE_Xandros_x64 = 0x5D100, |
| 5 |
VBOXOSTYPE_Oracle = 0x5E000, |
| 6 |
VBOXOSTYPE_Oracle_x64 = 0x5E100, |
| 7 |
+ VBOXOSTYPE_Mageia = 0x5F000, |
| 8 |
+ VBOXOSTYPE_Mageia_x64 = 0x5F100, |
| 9 |
VBOXOSTYPE_FreeBSD = 0x60000, |
| 10 |
VBOXOSTYPE_FreeBSD_x64 = 0x60100, |
| 11 |
VBOXOSTYPE_OpenBSD = 0x61000, |
| 12 |
--- VirtualBox-4.3.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh.0013 2014-02-26 01:00:31.000000000 +0800 |
| 13 |
+++ VirtualBox-4.3.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2014-02-26 07:19:43.140803196 +0800 |
| 14 |
@@ -215,8 +215,14 @@ |
| 15 |
x11_autostart="/etc/xdg/autostart" |
| 16 |
kde_autostart="/usr/share/autostart" |
| 17 |
redhat_dir=/etc/X11/Xsession.d |
| 18 |
+ mageia_dir=/etc/X11/xinit.d |
| 19 |
mandriva_dir=/etc/X11/xinit.d |
| 20 |
debian_dir=/etc/X11/xinit/xinitrc.d |
| 21 |
+ if [ -d "$mageia_dir" -a -w "$mageia_dir" -a -x "$mageia_dir" ] |
| 22 |
+ then |
| 23 |
+ install -m 0644 $app_src "$mageia_dir/$app_dest" |
| 24 |
+ found=1 |
| 25 |
+ fi |
| 26 |
if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ] |
| 27 |
then |
| 28 |
install -m 0644 $app_src "$mandriva_dir/$app_dest" |
| 29 |
--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp.0013 2014-02-26 01:08:50.000000000 +0800 |
| 30 |
+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2014-02-26 07:19:43.340808670 +0800 |
| 31 |
@@ -4164,6 +4164,8 @@ |
| 32 |
{"Fedora_64", ":/os_fedora_64.png"}, |
| 33 |
{"Gentoo", ":/os_gentoo.png"}, |
| 34 |
{"Gentoo_64", ":/os_gentoo_64.png"}, |
| 35 |
+ {"Mageia", ":/os_mageia.png"}, |
| 36 |
+ {"Mageia_64", ":/os_mageia_64.png"}, |
| 37 |
{"Mandriva", ":/os_mandriva.png"}, |
| 38 |
{"Mandriva_64", ":/os_mandriva_64.png"}, |
| 39 |
{"RedHat", ":/os_redhat.png"}, |
| 40 |
--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp.0013 2014-02-26 01:09:00.000000000 +0800 |
| 41 |
+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2014-02-26 07:53:32.926016647 +0800 |
| 42 |
@@ -121,8 +121,10 @@ |
| 43 |
{ QRegExp("Fe.*32", Qt::CaseInsensitive), "Fedora" }, |
| 44 |
{ QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" }, |
| 45 |
{ QRegExp("((Gen)|(Sab)).*32", Qt::CaseInsensitive), "Gentoo" }, |
| 46 |
- { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" }, |
| 47 |
- { QRegExp("((Man)|(Mag)).*32", Qt::CaseInsensitive), "Mandriva" }, |
| 48 |
+ { QRegExp("Mag.*64", Qt::CaseInsensitive), "Mageia_64" }, |
| 49 |
+ { QRegExp("Mag", Qt::CaseInsensitive), "Mageia" }, |
| 50 |
+ { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" }, |
| 51 |
+ { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" }, |
| 52 |
{ QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, |
| 53 |
{ QRegExp("((Red)|(rhel)|(cen)).*32", Qt::CaseInsensitive), "RedHat" }, |
| 54 |
{ QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" }, |
| 55 |
--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc.0013 2014-02-26 01:08:35.000000000 +0800 |
| 56 |
+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2014-02-26 07:19:44.130830290 +0800 |
| 57 |
@@ -19,6 +19,8 @@ |
| 58 |
<file alias="os_linux24_64.png">images/os_linux24_64.png</file> |
| 59 |
<file alias="os_linux26.png">images/os_linux26.png</file> |
| 60 |
<file alias="os_linux26_64.png">images/os_linux26_64.png</file> |
| 61 |
+ <file alias="os_mageia.png">images/os_mageia.png</file> |
| 62 |
+ <file alias="os_mageia_64.png">images/os_mageia_64.png</file> |
| 63 |
<file alias="os_mandriva.png">images/os_mandriva.png</file> |
| 64 |
<file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> |
| 65 |
<file alias="os_netbsd.png">images/os_netbsd.png</file> |
| 66 |
--- VirtualBox-4.3.8/src/VBox/Installer/linux/distributions_rpm.0013 2014-02-26 01:09:10.000000000 +0800 |
| 67 |
+++ VirtualBox-4.3.8/src/VBox/Installer/linux/distributions_rpm 2014-02-26 07:19:44.210832478 +0800 |
| 68 |
@@ -3,6 +3,10 @@ |
| 69 |
openSUSE113 = OPENSUSE_11_3 |
| 70 |
sles11.0 = SLES_11_0 |
| 71 |
sles10.1 = SLES_10_1 |
| 72 |
+mga4 = MAGEIA_4 |
| 73 |
+mga3 = MAGEIA_3 |
| 74 |
+mga2 = MAGEIA_2 |
| 75 |
+mga1 = MAGEIA_1 |
| 76 |
mdv2011.0 = MANDRIVA_2011_0 |
| 77 |
fedora18 = FEDORA_18 |
| 78 |
fedora17 = FEDORA_17 |
| 79 |
--- VirtualBox-4.3.8/src/VBox/Installer/linux/routines.sh.0013 2014-02-26 01:09:10.000000000 +0800 |
| 80 |
+++ VirtualBox-4.3.8/src/VBox/Installer/linux/routines.sh 2014-02-26 07:19:44.490840139 +0800 |
| 81 |
@@ -226,7 +226,7 @@ |
| 82 |
return 0 |
| 83 |
} |
| 84 |
|
| 85 |
-# Hack to handle Mandriva's speedboot runlevel |
| 86 |
+# Hack to handle Mageia & Mandriva's speedboot runlevel |
| 87 |
copy_install_script() { |
| 88 |
if [ "$ro_INIT_TYPE" = "sysv" -a -r /etc/sysconfig/speedboot ]; then |
| 89 |
cp "$1" "$2" 2>/dev/null |
| 90 |
--- VirtualBox-4.3.8/src/VBox/Installer/linux/VBoxSysInfo.sh.0013 2014-02-26 01:09:10.000000000 +0800 |
| 91 |
+++ VirtualBox-4.3.8/src/VBox/Installer/linux/VBoxSysInfo.sh 2014-02-26 07:19:44.810848894 +0800 |
| 92 |
@@ -43,6 +43,11 @@ |
| 93 |
# Debian-based system |
| 94 |
release=`cat /etc/debian_version` |
| 95 |
print_linux_info "Debian" $release |
| 96 |
+ elif [ -r /etc/mageia-release ] |
| 97 |
+ then |
| 98 |
+ # Mageia-based system |
| 99 |
+ release=`cat /etc/mageia-release | sed -e 's/[A-Za-z ]* release //'` |
| 100 |
+ print_linux_info "Mageia" $release |
| 101 |
elif [ -r /etc/mandriva-release ] |
| 102 |
then |
| 103 |
# Mandriva-based system |
| 104 |
--- VirtualBox-4.3.8/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h.0013 2014-02-26 01:09:11.000000000 +0800 |
| 105 |
+++ VirtualBox-4.3.8/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2014-02-26 07:19:45.690872981 +0800 |
| 106 |
@@ -921,7 +921,9 @@ |
| 107 |
CIMOSType_CIMOS_Linux_2_6_x = 99, |
| 108 |
CIMOSType_CIMOS_Linux_2_6_x_64 = 100, |
| 109 |
CIMOSType_CIMOS_Linux_64 = 101, |
| 110 |
- CIMOSType_CIMOS_Other_64 = 102 |
| 111 |
+ CIMOSType_CIMOS_Other_64 = 102, |
| 112 |
+ CIMOSType_CIMOS_Mageia = 111, |
| 113 |
+ CIMOSType_CIMOS_Mageia_64 = 112 |
| 114 |
}; |
| 115 |
/* End of enum CIMOSType Declaration */ |
| 116 |
|
| 117 |
--- VirtualBox-4.3.8/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h.0013 2014-02-26 01:09:11.000000000 +0800 |
| 118 |
+++ VirtualBox-4.3.8/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2014-02-26 07:19:45.760874897 +0800 |
| 119 |
@@ -1371,7 +1371,9 @@ |
| 120 |
CIMOSType_CIMOS_Linux_2_6_x = 99, |
| 121 |
CIMOSType_CIMOS_Linux_2_6_x_64 = 100, |
| 122 |
CIMOSType_CIMOS_Linux_64 = 101, |
| 123 |
- CIMOSType_CIMOS_Other_64 = 102 |
| 124 |
+ CIMOSType_CIMOS_Other_64 = 102, |
| 125 |
+ CIMOSType_CIMOS_Mageia = 111, |
| 126 |
+ CIMOSType_CIMOS_Mageia_64 = 112 |
| 127 |
}; |
| 128 |
/* End of enum CIMOSType Declaration */ |
| 129 |
|
| 130 |
--- VirtualBox-4.3.8/src/VBox/Main/include/ovfreader.h.0013 2014-02-26 01:09:14.000000000 +0800 |
| 131 |
+++ VirtualBox-4.3.8/src/VBox/Main/include/ovfreader.h 2014-02-26 07:19:45.850877359 +0800 |
| 132 |
@@ -174,8 +174,10 @@ |
| 133 |
CIMOSType_CIMOS_CentOS_64 = 107, |
| 134 |
CIMOSType_CIMOS_OracleEnterpriseLinux = 108, |
| 135 |
CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109, |
| 136 |
- CIMOSType_CIMOS_eComStation = 110 |
| 137 |
+ CIMOSType_CIMOS_eComStation = 110, |
| 138 |
// no new types added with CIM 2.26.0 |
| 139 |
+ CIMOSType_CIMOS_Mageia = 111, |
| 140 |
+ CIMOSType_CIMOS_Mageia_64 = 112 |
| 141 |
}; |
| 142 |
|
| 143 |
enum OVFVersion_T |
| 144 |
--- VirtualBox-4.3.8/src/VBox/Main/src-all/Global.cpp.0013 2014-02-26 01:09:14.000000000 +0800 |
| 145 |
+++ VirtualBox-4.3.8/src/VBox/Main/src-all/Global.cpp 2014-02-26 07:55:02.768483224 +0800 |
| 146 |
@@ -189,6 +189,14 @@ |
| 147 |
VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, |
| 148 |
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, |
| 149 |
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, |
| 150 |
+ { "Linux", "Linux", "Mageia", "Mageia", |
| 151 |
+ VBOXOSTYPE_Mageia, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, |
| 152 |
+ 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, |
| 153 |
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, |
| 154 |
+ { "Linux", "Linux", "Mageia_64", "Mageia (64 bit)", |
| 155 |
+ VBOXOSTYPE_Mageia_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, |
| 156 |
+ 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, |
| 157 |
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, |
| 158 |
{ "Linux", "Linux", "Mandriva", "Mandriva (32 bit)", |
| 159 |
VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, |
| 160 |
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, |
| 161 |
--- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp.0013 2014-02-26 01:09:15.000000000 +0800 |
| 162 |
+++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2014-02-26 07:19:45.860877633 +0800 |
| 163 |
@@ -118,6 +118,8 @@ |
| 164 |
{ ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, VBOXOSTYPE_Linux }, |
| 165 |
{ ovf::CIMOSType_CIMOS_TurboLinux, VBOXOSTYPE_Turbolinux }, |
| 166 |
{ ovf::CIMOSType_CIMOS_TurboLinux_64, VBOXOSTYPE_Turbolinux_x64 }, |
| 167 |
+ { ovf::CIMOSType_CIMOS_Mageia, VBOXOSTYPE_Mageia }, |
| 168 |
+ { ovf::CIMOSType_CIMOS_Mageia_64, VBOXOSTYPE_Mageia_x64 }, |
| 169 |
{ ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva }, |
| 170 |
{ ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 }, |
| 171 |
{ ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu }, |
| 172 |
@@ -180,6 +182,7 @@ |
| 173 |
{"SUSE", VBOXOSTYPE_OpenSUSE}, |
| 174 |
{"Novell", VBOXOSTYPE_OpenSUSE}, |
| 175 |
{"Red Hat", VBOXOSTYPE_RedHat}, |
| 176 |
+ {"Mageia", VBOXOSTYPE_Mageia}, |
| 177 |
{"Mandriva", VBOXOSTYPE_Mandriva}, |
| 178 |
{"Ubuntu", VBOXOSTYPE_Ubuntu}, |
| 179 |
{"Debian", VBOXOSTYPE_Debian}, |
| 180 |
@@ -209,6 +212,7 @@ |
| 181 |
{"SUSE", VBOXOSTYPE_OpenSUSE_x64}, |
| 182 |
{"Novell", VBOXOSTYPE_OpenSUSE_x64}, |
| 183 |
{"Red Hat", VBOXOSTYPE_RedHat_x64}, |
| 184 |
+ {"Mageia", VBOXOSTYPE_Mageia_x64}, |
| 185 |
{"Mandriva", VBOXOSTYPE_Mandriva_x64}, |
| 186 |
{"Ubuntu", VBOXOSTYPE_Ubuntu_x64}, |
| 187 |
{"Debian", VBOXOSTYPE_Debian_x64}, |
| 188 |
--- VirtualBox-4.3.8/src/VBox/Main/xml/Settings.cpp.0013 2014-02-26 01:09:19.000000000 +0800 |
| 189 |
+++ VirtualBox-4.3.8/src/VBox/Main/xml/Settings.cpp 2014-02-26 07:19:45.870877908 +0800 |
| 190 |
@@ -3796,6 +3796,7 @@ |
| 191 |
{ "opensuse", "OpenSUSE" }, |
| 192 |
{ "fedoracore", "Fedora" }, |
| 193 |
{ "gentoo", "Gentoo" }, |
| 194 |
+ { "mageia", "Mageia" }, |
| 195 |
{ "mandriva", "Mandriva" }, |
| 196 |
{ "redhat", "RedHat" }, |
| 197 |
{ "ubuntu", "Ubuntu" }, |
Parent Directory
| 
Revision Log