1 --- VirtualBox-4.2.12/./src/VBox/Main/xml/Settings.cpp~ 2013-04-12 13:38:26.000000000 +0300
2 +++ VirtualBox-4.2.12/./src/VBox/Main/xml/Settings.cpp 2013-05-13 15:49:30.035999373 +0300
4 { "xandros", "Xandros" },
5 { "freebsd", "FreeBSD" },
6 { "openbsd", "OpenBSD" },
8 { "netbsd", "NetBSD" },
9 { "netware", "Netware" },
10 { "solaris", "Solaris" },
11 --- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc~ 2013-04-12 13:37:50.000000000 +0300
12 +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2013-05-13 15:51:14.323890458 +0300
14 <file alias="os_netware.png">images/os_netware.png</file>
15 <file alias="os_openbsd.png">images/os_openbsd.png</file>
16 <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
17 + <file alias="os_pld.png">images/os_pld.png</file>
18 + <file alias="os_pld_64.png">images/os_pld_64.png</file>
19 <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file>
20 <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file>
21 <file alias="os_opensuse.png">images/os_opensuse.png</file>
22 --- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp~ 2013-04-12 13:37:59.000000000 +0300
23 +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2013-05-13 15:51:51.668860824 +0300
25 {"FreeBSD_64", ":/os_freebsd_64.png"},
26 {"OpenBSD", ":/os_openbsd.png"},
27 {"OpenBSD_64", ":/os_openbsd_64.png"},
28 + {"PLD", ":/os_pld.png"},
29 + {"PLD_64", ":/os_pld_64.png"},
30 {"NetBSD", ":/os_netbsd.png"},
31 {"NetBSD_64", ":/os_netbsd_64.png"},
32 {"Solaris", ":/os_solaris.png"},
33 --- VirtualBox-4.3.8/src/VBox/Main/src-all/Global.cpp~ 2014-02-25 19:09:14.000000000 +0200
34 +++ VirtualBox-4.3.8/src/VBox/Main/src-all/Global.cpp 2014-02-28 09:50:05.965655744 +0200
36 VBOXOSTYPE_Linux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
37 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
38 StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
39 + { "Linux", "Linux", "PLD", "PLD Linux (32 bit)",
40 + VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
41 + 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
42 + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
43 + { "Linux", "Linux", "PLD_64", "PLD Linux (64 bit)",
44 + VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
45 + 896, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
46 + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
47 { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32 bit)",
48 VBOXOSTYPE_Solaris, VBOXOSHINT_NONE,
49 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
50 --- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~ 2014-02-25 19:09:15.000000000 +0200
51 +++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2014-02-28 09:52:48.663191185 +0200
53 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 },
54 { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris },
55 { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_OpenSolaris_x64 },
56 + { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_PLD },
57 + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_PLD_x64 },
59 // types added with CIM 2.25.0 follow:
60 { ovf::CIMOSType_CIMOS_WindowsServer2008R2, VBOXOSTYPE_Win2k8 }, // duplicate, see above
61 --- VirtualBox-4.3.8/include/VBox/ostypes.h~ 2014-02-25 18:59:48.000000000 +0200
62 +++ VirtualBox-4.3.8/include/VBox/ostypes.h 2014-02-28 09:56:34.440314457 +0200
64 VBOXOSTYPE_Xandros_x64 = 0x5D100,
65 VBOXOSTYPE_Oracle = 0x5E000,
66 VBOXOSTYPE_Oracle_x64 = 0x5E100,
67 + VBOXOSTYPE_PLD = 0x5F000,
68 + VBOXOSTYPE_PLD_x64 = 0x5F100,
69 VBOXOSTYPE_FreeBSD = 0x60000,
70 VBOXOSTYPE_FreeBSD_x64 = 0x60100,
71 VBOXOSTYPE_OpenBSD = 0x61000,
72 --- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp~ 2014-02-25 19:09:00.000000000 +0200
73 +++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2014-02-28 09:58:59.493698505 +0200
75 { QRegExp("Xa.*32", Qt::CaseInsensitive), "Xandros" },
76 { QRegExp("((Or)|(oel)|(ol)).*64", Qt::CaseInsensitive), "Oracle_64" },
77 { QRegExp("((Or)|(oel)|(ol)).*32", Qt::CaseInsensitive), "Oracle" },
78 + { QRegExp("PLD.*64", Qt::CaseInsensitive), "PLD_64" },
79 + { QRegExp("PLD.*32", Qt::CaseInsensitive), "PLD" },
80 { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
81 { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
82 { QRegExp("((Lin)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },