Changeset 94460 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 4, 2022 8:30:21 PM (3 years ago)

Author:

vboxsync

Message:

VBox/ostypes.h+Main/Global,Machine,UnattendedInstaller+FE/Qt: First pass
at updating the variety of Linux OS subtypes used at install time along
with their corresponding recommended installation defaults based on each
vendor's respective documentation. bugref:5936

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIIconPool.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

@@ -371 +371 @@
     m_guestOSTypeIconNames.insert("Debian",          ":/os_debian.png");
     m_guestOSTypeIconNames.insert("Debian_64",       ":/os_debian_64.png");
+    m_guestOSTypeIconNames.insert("Debian31",        ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian4",         ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian4_64",      ":/os_debian_64.png");
+    m_guestOSTypeIconNames.insert("Debian5",         ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian5_64",      ":/os_debian_64.png");
+    m_guestOSTypeIconNames.insert("Debian5",         ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian5_64",      ":/os_debian_64.png");
+    m_guestOSTypeIconNames.insert("Debian6",         ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian6_64",      ":/os_debian_64.png");
+    m_guestOSTypeIconNames.insert("Debian7",         ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian7_64",      ":/os_debian_64.png");
+    m_guestOSTypeIconNames.insert("Debian8",         ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian8_64",      ":/os_debian_64.png");
+    m_guestOSTypeIconNames.insert("Debian9",         ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian9_64",      ":/os_debian_64.png");
+    m_guestOSTypeIconNames.insert("Debian10",        ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian10_64",     ":/os_debian_64.png");
+    m_guestOSTypeIconNames.insert("Debian11",        ":/os_debian.png");
+    m_guestOSTypeIconNames.insert("Debian11_64",     ":/os_debian_64.png");
     m_guestOSTypeIconNames.insert("OpenSUSE",        ":/os_opensuse.png");
     m_guestOSTypeIconNames.insert("OpenSUSE_64",     ":/os_opensuse_64.png");
+    m_guestOSTypeIconNames.insert("OpenSUSE_Leap_64", ":/os_opensuse_64.png");
+    m_guestOSTypeIconNames.insert("OpenSUSE_Tumbleweed",    ":/os_opensuse.png");
+    m_guestOSTypeIconNames.insert("OpenSUSE_Tumbleweed_64", ":/os_opensuse_64.png");
+    m_guestOSTypeIconNames.insert("SUSE_LE",         ":/os_opensuse.png");
+    m_guestOSTypeIconNames.insert("SUSE_LE_64",      ":/os_opensuse_64.png");
     m_guestOSTypeIconNames.insert("Fedora",          ":/os_fedora.png");
     m_guestOSTypeIconNames.insert("Fedora_64",       ":/os_fedora_64.png");
@@ -379 +403 @@
     m_guestOSTypeIconNames.insert("Mandriva",        ":/os_mandriva.png");
     m_guestOSTypeIconNames.insert("Mandriva_64",     ":/os_mandriva_64.png");
+    m_guestOSTypeIconNames.insert("OpenMandriva_Lx", ":/os_mandriva.png");
+    m_guestOSTypeIconNames.insert("OpenMandriva_Lx_64", ":/os_mandriva_64.png");
+    m_guestOSTypeIconNames.insert("PCLinuxOS",       ":/os_mandriva.png");
+    m_guestOSTypeIconNames.insert("PCLinuxOS_64",    ":/os_mandriva_64.png");
+    m_guestOSTypeIconNames.insert("Mageia",          ":/os_mandriva.png");
+    m_guestOSTypeIconNames.insert("Mageia_64",       ":/os_mandriva_64.png");
     m_guestOSTypeIconNames.insert("RedHat",          ":/os_redhat.png");
     m_guestOSTypeIconNames.insert("RedHat_64",       ":/os_redhat_64.png");
+    m_guestOSTypeIconNames.insert("RedHat3",         ":/os_redhat.png");
+    m_guestOSTypeIconNames.insert("RedHat3_64",      ":/os_redhat_64.png");
+    m_guestOSTypeIconNames.insert("RedHat4",         ":/os_redhat.png");
+    m_guestOSTypeIconNames.insert("RedHat4_64",      ":/os_redhat_64.png");
+    m_guestOSTypeIconNames.insert("RedHat5",         ":/os_redhat.png");
+    m_guestOSTypeIconNames.insert("RedHat5_64",      ":/os_redhat_64.png");
+    m_guestOSTypeIconNames.insert("RedHat6",         ":/os_redhat.png");
+    m_guestOSTypeIconNames.insert("RedHat6_64",      ":/os_redhat_64.png");
+    m_guestOSTypeIconNames.insert("RedHat7_64",      ":/os_redhat_64.png");
+    m_guestOSTypeIconNames.insert("RedHat8_64",      ":/os_redhat_64.png");
     m_guestOSTypeIconNames.insert("Turbolinux",      ":/os_turbolinux.png");
     m_guestOSTypeIconNames.insert("Turbolinux_64",   ":/os_turbolinux_64.png");
     m_guestOSTypeIconNames.insert("Ubuntu",          ":/os_ubuntu.png");
     m_guestOSTypeIconNames.insert("Ubuntu_64",       ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu10_LTS",    ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu10_LTS_64", ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu10",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu10_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu11",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu11_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu12_LTS",    ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu12_LTS_64", ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu12",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu12_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu13",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu13_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu14_LTS",    ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu14_LTS_64", ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu14",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu14_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu15",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu15_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu16_LTS",    ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu16_LTS_64", ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu16",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu16_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu17",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu17_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu18_LTS",    ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu18_LTS_64", ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu18",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu18_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu19",        ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Ubuntu19_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu20_LTS_64", ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu20_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu21_LTS_64", ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu21_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu22_LTS_64", ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Ubuntu22_64",     ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Lubuntu",         ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Lubuntu_64",      ":/os_ubuntu_64.png");
+    m_guestOSTypeIconNames.insert("Xubuntu",         ":/os_ubuntu.png");
+    m_guestOSTypeIconNames.insert("Xubuntu_64",      ":/os_ubuntu_64.png");
     m_guestOSTypeIconNames.insert("Xandros",         ":/os_xandros.png");
     m_guestOSTypeIconNames.insert("Xandros_64",      ":/os_xandros_64.png");
+    m_guestOSTypeIconNames.insert("Oracle",          ":/os_oracle.png");
+    m_guestOSTypeIconNames.insert("Oracle_64",       ":/os_oracle_64.png");
+    m_guestOSTypeIconNames.insert("Oracle3",         ":/os_oracle.png");
+    m_guestOSTypeIconNames.insert("Oracle3_64",      ":/os_oracle_64.png");
+    m_guestOSTypeIconNames.insert("Oracle4",         ":/os_oracle.png");
+    m_guestOSTypeIconNames.insert("Oracle4_64",      ":/os_oracle_64.png");
+    m_guestOSTypeIconNames.insert("Oracle5",         ":/os_oracle.png");
+    m_guestOSTypeIconNames.insert("Oracle5_64",      ":/os_oracle_64.png");
+    m_guestOSTypeIconNames.insert("Oracle6",         ":/os_oracle.png");
+    m_guestOSTypeIconNames.insert("Oracle6_64",      ":/os_oracle_64.png");
+    m_guestOSTypeIconNames.insert("Oracle7_64",      ":/os_oracle_64.png");
+    m_guestOSTypeIconNames.insert("Oracle8_64",      ":/os_oracle_64.png");
     m_guestOSTypeIconNames.insert("Oracle",          ":/os_oracle.png");
     m_guestOSTypeIconNames.insert("Oracle_64",       ":/os_oracle_64.png");

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -122 +122 @@
     { QRegularExpression("((bianca)|(cassandra)|(celena)|(daryna)|(elyssa)|(felicia)|(gloria)|(helena)|(isadora)|(julia)|(katya)|(lisa)|(maya)|(nadia)|(olivia)|(petra)|(qiana)|(rebecca)|(rafaela)|(rosa)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" },
     { QRegularExpression("((bianca)|(cassandra)|(celena)|(daryna)|(elyssa)|(felicia)|(gloria)|(helena)|(isadora)|(julia)|(katya)|(lisa)|(maya)|(nadia)|(olivia)|(petra)|(qiana)|(rebecca)|(rafaela)|(rosa)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu" },
-    { QRegularExpression("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)|(saucy)|(trusty)|(utopic)|(vivid)|(wily)|(xenial)|(yakkety)|(zesty)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" },
-    { QRegularExpression("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)|(saucy)|(trusty)|(utopic)|(vivid)|(wily)|(xenial)|(yakkety)|(zesty)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu" },
-    { QRegularExpression("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(stretch)|(buster)|(sid)).*64", QRegularExpression::CaseInsensitiveOption), "Debian_64" },
-    { QRegularExpression("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(stretch)|(buster)|(sid)).*32", QRegularExpression::CaseInsensitiveOption), "Debian" },
-    { QRegularExpression("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", QRegularExpression::CaseInsensitiveOption), "Fedora_64" },
-    { QRegularExpression("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*32", QRegularExpression::CaseInsensitiveOption), "Fedora" },
+    { QRegularExpression("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)).*64",  QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" },
+    { QRegularExpression("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)).*32",  QRegularExpression::CaseInsensitiveOption), "Ubuntu" },
+    { QRegularExpression("((eft)|(fawn)|(gibbon)|(heron)|(ibex)|(jackalope)|(koala)).*64",      QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" },
+    { QRegularExpression("((eft)|(fawn)|(gibbon)|(heron)|(ibex)|(jackalope)|(koala)).*32",      QRegularExpression::CaseInsensitiveOption), "Ubuntu" },
+    { QRegularExpression("((lucid)|(lynx)).*64",                                                QRegularExpression::CaseInsensitiveOption), "Ubuntu10_LTS_64" },
+    { QRegularExpression("((lucid)|(lynx)).*32",                                                QRegularExpression::CaseInsensitiveOption), "Ubuntu10_LTS" },
+    { QRegularExpression("((maverick)|(meerkat)).*64",                                          QRegularExpression::CaseInsensitiveOption), "Ubuntu10_64" },
+    { QRegularExpression("((maverick)|(meerkat)).*32",                                          QRegularExpression::CaseInsensitiveOption), "Ubuntu10" },
+    { QRegularExpression("((natty)|(narwhal)|(oneiric)|(ocelot)).*64",                          QRegularExpression::CaseInsensitiveOption), "Ubuntu11_64" },
+    { QRegularExpression("((natty)|(narwhal)|(oneiric)|(ocelot)).*32",                          QRegularExpression::CaseInsensitiveOption), "Ubuntu11" },
+    { QRegularExpression("((precise)|(pangolin)).*64",                                          QRegularExpression::CaseInsensitiveOption), "Ubuntu12_LTS_64" },
+    { QRegularExpression("((precise)|(pangolin)).*32",                                          QRegularExpression::CaseInsensitiveOption), "Ubuntu12_LTS" },
+    { QRegularExpression("((quantal)|(quetzal)).*64",                                           QRegularExpression::CaseInsensitiveOption), "Ubuntu12_64" },
+    { QRegularExpression("((quantal)|(quetzal)).*32",                                           QRegularExpression::CaseInsensitiveOption), "Ubuntu12" },
+    { QRegularExpression("((raring)|(ringtail)|(saucy)|(salamander)).*64",                      QRegularExpression::CaseInsensitiveOption), "Ubuntu13_64" },
+    { QRegularExpression("((raring)|(ringtail)|(saucy)|(salamander)).*32",                      QRegularExpression::CaseInsensitiveOption), "Ubuntu13" },
+    { QRegularExpression("((trusty)|(tahr)).*64",                                               QRegularExpression::CaseInsensitiveOption), "Ubuntu14_LTS_64" },
+    { QRegularExpression("((trusty)|(tahr)).*32",                                               QRegularExpression::CaseInsensitiveOption), "Ubuntu14_LTS" },
+    { QRegularExpression("((utopic)|(unicorn)).*64",                                            QRegularExpression::CaseInsensitiveOption), "Ubuntu14_64" },
+    { QRegularExpression("((utopic)|(unicorn)).*32",                                            QRegularExpression::CaseInsensitiveOption), "Ubuntu14" },
+    { QRegularExpression("((vivid)|(vervet)|(wily)|(werewolf)).*64",                            QRegularExpression::CaseInsensitiveOption), "Ubuntu15_64" },
+    { QRegularExpression("((vivid)|(vervet)|(wily)|(werewolf)).*32",                            QRegularExpression::CaseInsensitiveOption), "Ubuntu15" },
+    { QRegularExpression("((xenial)|(xerus)).*64",                                              QRegularExpression::CaseInsensitiveOption), "Ubuntu16_LTS_64" },
+    { QRegularExpression("((xenial)|(xerus)).*32",                                              QRegularExpression::CaseInsensitiveOption), "Ubuntu16_LTS" },
+    { QRegularExpression("((yakkety)|(yak)).*64",                                               QRegularExpression::CaseInsensitiveOption), "Ubuntu16_64" },
+    { QRegularExpression("((yakkety)|(yak)).*32",                                               QRegularExpression::CaseInsensitiveOption), "Ubuntu16" },
+    { QRegularExpression("((zesty)|(zapus)|(artful)|(aardvark)).*64",                           QRegularExpression::CaseInsensitiveOption), "Ubuntu17_64" },
+    { QRegularExpression("((zesty)|(zapus)|(artful)|(aardvark)).*32",                           QRegularExpression::CaseInsensitiveOption), "Ubuntu17" },
+    { QRegularExpression("((bionic)|(beaver)).*64",                                             QRegularExpression::CaseInsensitiveOption), "Ubuntu18_LTS_64" },
+    { QRegularExpression("((bionic)|(beaver)).*32",                                             QRegularExpression::CaseInsensitiveOption), "Ubuntu18_LTS" },
+    { QRegularExpression("((cosmic)|(cuttlefish)).*64",                                         QRegularExpression::CaseInsensitiveOption), "Ubuntu18_64" },
+    { QRegularExpression("((cosmic)|(cuttlefish)).*32",                                         QRegularExpression::CaseInsensitiveOption), "Ubuntu18" },
+    { QRegularExpression("((disco)|(dingo)|(eoan)|(ermine)).*64",                               QRegularExpression::CaseInsensitiveOption), "Ubuntu19_64" },
+    { QRegularExpression("((disco)|(dingo)|(eoan)|(ermine)).*32",                               QRegularExpression::CaseInsensitiveOption), "Ubuntu19" },
+    { QRegularExpression("((focal)|(fossa)).*64",                                               QRegularExpression::CaseInsensitiveOption), "Ubuntu20_LTS_64" },
+    { QRegularExpression("((groovy)|(gorilla)).*64",                                            QRegularExpression::CaseInsensitiveOption), "Ubuntu20_64" },
+    { QRegularExpression("((hirsute)|(hippo)|(impish)|(indri)).*64",                            QRegularExpression::CaseInsensitiveOption), "Ubuntu21_64" },
+    { QRegularExpression("((jammy)|(jellyfish)).*64",                                           QRegularExpression::CaseInsensitiveOption), "Ubuntu22_LTS_64" },
+    { QRegularExpression("sarge.*32",                         QRegularExpression::CaseInsensitiveOption), "Debian31" },
+    { QRegularExpression("^etch.*64",                         QRegularExpression::CaseInsensitiveOption), "Debian4_64" },
+    { QRegularExpression("^etch.*32",                         QRegularExpression::CaseInsensitiveOption), "Debian4" },
+    { QRegularExpression("lenny.*64",                         QRegularExpression::CaseInsensitiveOption), "Debian5_64" },
+    { QRegularExpression("lenny.*32",                         QRegularExpression::CaseInsensitiveOption), "Debian5" },
+    { QRegularExpression("squeeze.*64",                       QRegularExpression::CaseInsensitiveOption), "Debian6_64" },
+    { QRegularExpression("squeeze.*32",                       QRegularExpression::CaseInsensitiveOption), "Debian6" },
+    { QRegularExpression("wheezy.*64",                        QRegularExpression::CaseInsensitiveOption), "Debian7_64" },
+    { QRegularExpression("wheezy.*32",                        QRegularExpression::CaseInsensitiveOption), "Debian7" },
+    { QRegularExpression("jessie.*64",                        QRegularExpression::CaseInsensitiveOption), "Debian8_64" },
+    { QRegularExpression("jessie.*32",                        QRegularExpression::CaseInsensitiveOption), "Debian8" },
+    { QRegularExpression("stretch.*64",                       QRegularExpression::CaseInsensitiveOption), "Debian9_64" },
+    { QRegularExpression("stretch.*32",                       QRegularExpression::CaseInsensitiveOption), "Debian9" },
+    { QRegularExpression("buster.*64",                        QRegularExpression::CaseInsensitiveOption), "Debian10_64" },
+    { QRegularExpression("buster.*32",                        QRegularExpression::CaseInsensitiveOption), "Debian10" },
+    { QRegularExpression("bullseye.*64",                      QRegularExpression::CaseInsensitiveOption), "Debian11_64" },
+    { QRegularExpression("bullseye.*32",                      QRegularExpression::CaseInsensitiveOption), "Debian11" },
+    { QRegularExpression("((bookworm)|(trixie)|(sid)).*64",   QRegularExpression::CaseInsensitiveOption), "Debian_64" },
+    { QRegularExpression("((bookworm)|(trixie)|(sid)).*32",   QRegularExpression::CaseInsensitiveOption), "Debian" },
+    { QRegularExpression("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)|(schrodinger)|(heisenberg)).*64", QRegularExpression::CaseInsensitiveOption), "Fedora_64" },
+    { QRegularExpression("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)|(schrodinger)|(heisenberg)).*32", QRegularExpression::CaseInsensitiveOption), "Fedora" },
+    { QRegularExpression("((basilisk)|(emerald)|(teal)|(celadon)|(asparagus)|(mantis)|(dartmouth)|(bottle)|(harlequin)).*64", QRegularExpression::CaseInsensitiveOption), "OpenSUSE_64" },
+    { QRegularExpression("((basilisk)|(emerald)|(teal)|(celadon)|(asparagus)|(mantis)|(dartmouth)|(bottle)|(harlequin)).*32", QRegularExpression::CaseInsensitiveOption), "OpenSUSE" },
 
     /* Regular names of Linux distributions: */
@@ -134 +189 @@
     { QRegularExpression("Deb.*64",                           QRegularExpression::CaseInsensitiveOption), "Debian_64" },
     { QRegularExpression("Deb.*32",                           QRegularExpression::CaseInsensitiveOption), "Debian" },
+    { QRegularExpression("SU.*Leap.*64",                      QRegularExpression::CaseInsensitiveOption), "OpenSUSE_Leap_64" },
+    { QRegularExpression("SU.*Tumble.*64",                    QRegularExpression::CaseInsensitiveOption), "OpenSUSE_Tumbleweed_64" },
+    { QRegularExpression("SU.*Tumble.*32",                    QRegularExpression::CaseInsensitiveOption), "OpenSUSE_Tumbleweed" },
     { QRegularExpression("((SU)|(Nov)|(SLE)).*64",            QRegularExpression::CaseInsensitiveOption), "OpenSUSE_64" },
     { QRegularExpression("((SU)|(Nov)|(SLE)).*32",            QRegularExpression::CaseInsensitiveOption), "OpenSUSE" },
@@ -140 +198 @@
     { QRegularExpression("((Gen)|(Sab)).*64",                 QRegularExpression::CaseInsensitiveOption), "Gentoo_64" },
     { QRegularExpression("((Gen)|(Sab)).*32",                 QRegularExpression::CaseInsensitiveOption), "Gentoo" },
-    { QRegularExpression("((Man)|(Mag)).*64",                 QRegularExpression::CaseInsensitiveOption), "Mandriva_64" },
-    { QRegularExpression("((Man)|(Mag)).*32",                 QRegularExpression::CaseInsensitiveOption), "Mandriva" },
+    { QRegularExpression("^Man.*64",                          QRegularExpression::CaseInsensitiveOption), "Mandriva_64" },
+    { QRegularExpression("^Man.*32",                          QRegularExpression::CaseInsensitiveOption), "Mandriva" },
+    { QRegularExpression("Op.*Man.*Lx.*64",                   QRegularExpression::CaseInsensitiveOption), "OpenMandriva_Lx_64" },
+    { QRegularExpression("Op.*Man.*Lx.*32",                   QRegularExpression::CaseInsensitiveOption), "OpenMandriva_Lx" },
+    { QRegularExpression("PCL.*OS.*64",                       QRegularExpression::CaseInsensitiveOption), "PCLinuxOS_64" },
+    { QRegularExpression("PCL.*OS.*32",                       QRegularExpression::CaseInsensitiveOption), "PCLinuxOS" },
+    { QRegularExpression("Mageia.*64",                        QRegularExpression::CaseInsensitiveOption), "Mageia_64" },
+    { QRegularExpression("Mageia.*32",                        QRegularExpression::CaseInsensitiveOption), "Mageia" },
     { QRegularExpression("((Red)|(rhel)|(cen)).*64",          QRegularExpression::CaseInsensitiveOption), "RedHat_64" },
     { QRegularExpression("((Red)|(rhel)|(cen)).*32",          QRegularExpression::CaseInsensitiveOption), "RedHat" },
     { QRegularExpression("Tur.*64",                           QRegularExpression::CaseInsensitiveOption), "Turbolinux_64" },
     { QRegularExpression("Tur.*32",                           QRegularExpression::CaseInsensitiveOption), "Turbolinux" },
+    { QRegularExpression("Lub.*64",                           QRegularExpression::CaseInsensitiveOption), "Lubuntu_64" },
+    { QRegularExpression("Lub.*32",                           QRegularExpression::CaseInsensitiveOption), "Lubuntu" },
+    { QRegularExpression("Xub.*64",                           QRegularExpression::CaseInsensitiveOption), "Xubuntu_64" },
+    { QRegularExpression("Xub.*32",                           QRegularExpression::CaseInsensitiveOption), "Xubuntu" },
     { QRegularExpression("((Ub)|(Mint)).*64",                 QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" },
     { QRegularExpression("((Ub)|(Mint)).*32",                 QRegularExpression::CaseInsensitiveOption), "Ubuntu" },