| 4f798549 | 2014-12-04 10:00:41 | Timothy Pearson |
Revert "Remove many obsolete distributions and add newer distributions instead" This reverts commit 914e923d52314022b64ee792d60590489be318af. |
||
|
M knetworkconf/backends/platform.pl.in |
||
diff --git a/knetworkconf/backends/platform.pl.in b/knetworkconf/backends/platform.pl.in
index 777dfec..0e60dcd 100644
--- a/knetworkconf/backends/platform.pl.in
+++ b/knetworkconf/backends/platform.pl.in
@@ -38,28 +38,43 @@
$PLATFORM_INFO = {
+ "debian-2.2" => "Debian GNU/Linux 2.2 Potato",
+ "debian-3.0" => "Debian GNU/Linux 3.0 Woody",
+ "debian-3.1" => "Debian GNU/Linux 3.1 Sarge",
+ "debian-4.0" => "Debian GNU/Linux 4.0 Etch",
"debian-5.0" => "Debian GNU/Linux 5.0 Lenny",
"debian-6.0" => "Debian GNU/Linux 6.0 Squeeze",
"debian-7.0" => "Debian GNU/Linux 7.0 Wheezy",
- "debian-8.0" => "Debian GNU/Linux 8.0 Jessie",
"debian-testing" => "Debian GNU/Linux Testing/Unstable",
- "ubuntu-8.04" => "Ubuntu 8.04, Hardy Heron",
- "ubuntu-8.10" => "Ubuntu 8.10, Intrepid Ibex",
- "ubuntu-9.04" => "Ubuntu 9.04, Jaunty Jackalope",
- "ubuntu-9.10" => "Ubuntu 9.10, Karmic Koala",
- "ubuntu-10.04" => "Ubuntu 10.04, Lucid Lynx",
- "ubuntu-10.10" => "Ubuntu 10.10, Maverick Meerkat",
- "ubuntu-11.04" => "Ubuntu 11.04, Natty Narwhal",
- "ubuntu-11.10" => "Ubuntu 11.10, Oneiric Ocelot",
- "ubuntu-12.04" => "Ubuntu 12.04, Precise Pangolin",
- "ubuntu-12.10" => "Ubuntu 12.10, Quantal Quetzal",
- "ubuntu-13.04" => "Ubuntu 13.04, Raring Ringtail",
- "ubuntu-13.10" => "Ubuntu 13.10, Saucy Salamander",
- "ubuntu-14.04" => "Ubuntu 14.04, Trusty Tahr",
- "ubuntu-14.10" => "Ubuntu 14.10, Utopic Unicorn",
+ "ubuntu-5.04" => "Kubuntu 5.04, Hoary Hedgehog",
+ "ubuntu-5.10" => "Kubuntu 5.10, Breezy Badger",
+ "ubuntu-6.06" => "Kubuntu 6.06, Dapper Drake",
+ "ubuntu-6.10" => "Kubuntu 6.10, Edgy Eft",
+ "ubuntu-7.04" => "Kubuntu 7.04, Feisty Fawn",
+ "ubuntu-7.10" => "Kubuntu 7.10, Gutsy Gibbon",
+ "ubuntu-8.04" => "Kubuntu 8.04, Hardy Heron",
+ "ubuntu-8.10" => "Kubuntu 8.10, Intrepid Ibex",
+ "ubuntu-9.04" => "Kubuntu 9.04, Jaunty Jackalope",
+ "ubuntu-9.10" => "Kubuntu 9.10, Karmic Koala",
+ "ubuntu-10.04" => "Kubuntu 10.04, Lucid Lynx",
+ "ubuntu-10.10" => "Kubuntu 10.10, Maverick Meerkat",
+ "ubuntu-11.04" => "Kubuntu 11.04, Natty Narwhal",
+ "ubuntu-11.10" => "Kubuntu 11.10, Oneiric Ocelot",
+ "ubuntu-12.04" => "Kubuntu 12.04, Precise Pangolin",
+ "ubuntu-12.10" => "Kubuntu 12.10, Quantal Quetzal",
+ "ubuntu-13.04" => "Kubuntu 13.04, Raring Ringtail",
+ "redhat-5.2" => "Red Hat Linux 5.2 Apollo",
+ "redhat-6.0" => "Red Hat Linux 6.0 Hedwig",
+ "redhat-6.1" => "Red Hat Linux 6.1 Cartman",
+ "redhat-6.2" => "Red Hat Linux 6.2 Zoot",
+ "redhat-7.0" => "Red Hat Linux 7.0 Guinness",
+ "redhat-7.1" => "Red Hat Linux 7.1 Seawolf",
+ "redhat-7.2" => "Red Hat Linux 7.2 Enigma",
+ "redhat-7.3" => "Red Hat Linux 7.3 Valhalla",
+ "redhat-8.0" => "Red Hat Linux 8.0 Psyche",
+ "redhat-9" => "Red Hat Linux 9.0 Shrike",
"rhel-5" => "Enterprise Linux 5",
"rhel-6" => "Enterprise Linux 6",
- "rhel-7" => "Enterprise Linux 7",
"openna-1.0" => "OpenNA Linux 1.0 VSLC",
"mandrake-7.1" => "Linux Mandrake 7.1",
"mandrake-7.2" => "Linux Mandrake 7.2 Odyssey",
@@ -74,17 +89,25 @@
"mandriva-2006.1" => "Mandriva Linux 2006.1",
"mandriva-2007.0" => "Mandriva Linux 2007.0",
"mandriva-2007.1" => "Mandriva Linux 2007.1",
- "suse-10.0" => "SuSE Linux 10.0",
- "suse-10.1" => "SuSE Linux 10.1",
- "suse-10.2" => "SuSE Linux 10.2",
- "suse-10.3" => "SuSE Linux 10.3",
- "suse-10.4" => "SuSE Linux 10.4",
- "suse-10.0" => "SuSE Linux 10.0",
- "suse-11.0" => "SuSE Linux 11.0",
- "suse-11.1" => "SuSE Linux 11.1",
- "suse-11.2" => "SuSE Linux 11.2",
- "suse-11.3" => "SuSE Linux 11.3",
+ "yoper-2.2" => "Yoper Linux 2.2",
+ "blackpanther-4.0" => "Black Panther OS 4.0",
+ "conectiva-9" => "Conectiva Linux 9",
+ "conectiva-10" => "Conectiva Linux 10",
+ "suse-7.0" => "SuSE Linux 7.0",
+ "suse-9.0" => "SuSE Linux 9.0",
+ "suse-9.1" => "SuSE Linux 9.1",
"turbolinux-7.0" => "Turbolinux 7.0",
+ "slackware-8.0.0" => "Slackware 8.0.0",
+ "slackware-8.1" => "Slackware 8.1",
+ "slackware-9.0.0" => "Slackware 9.0.0",
+ "slackware-9.1.0" => "Slackware 9.1.0",
+ "slackware-10.0.0" => "Slackware 10.0.0",
+ "slackware-10.1.0" => "Slackware 10.1.0",
+ "slackware-10.2.0" => "Slackware 10.2.0",
+ "slackware-11.0.0" => "Slackware 11.0.0",
+ "slackware-12.0.0" => "Slackware 12.0.0",
+ "slackware-12.1.0" => "Slackware 12.1.0",
+ "slackware-12.2.0" => "Slackware 12.2.0",
"slackware-13.0.0" => "Slackware 13.0.0",
"slackware-13.1.0" => "Slackware 13.1.0",
"slackware-13.37.0" => "Slackware 13.37.0",
@@ -93,25 +116,22 @@
"freebsd-4" => "FreeBSD 4",
"freebsd-5" => "FreeBSD 5",
"freebsd-6" => "FreeBSD 6",
- "freebsd-7" => "FreeBSD 7",
- "freebsd-8" => "FreeBSD 8",
- "freebsd-9" => "FreeBSD 9",
- "freebsd-10" => "FreeBSD 10",
"gentoo" => "Gentoo Linux",
+ "vlos-1.2" => "Vida Linux OS 1.2",
"archlinux" => "Arch Linux",
"pld-1.0" => "PLD 1.0 Ra",
"pld-1.1" => "PLD 1.1 Ra",
- "pld-2.0" => "PLD 2.0 Ac",
- "pld-3.0" => "PLD 3.0 Th",
+ "pld-1.99" => "PLD 1.99 Ac-pre",
"vine-3.0" => "Vine Linux 3.0",
"vine-3.1" => "Vine Linux 3.1",
+ "fedora-1" => "Fedora Core 1 (Yarrow)",
+ "fedora-2" => "Fedora Core 2 (Tettnang)",
+ "fedora-3" => "Fedora Core 3 (Heidelberg)",
+ "fedora-4" => "Fedora Core 4 (Stentz)",
+ "fedora-5" => "Fedora Core 5 (Bordeaux)",
"fedora-15" => "Fedora 15 (LoveLock)",
"fedora-16" => "Fedora 16 (Verne)",
"fedora-17" => "Fedora 17 (Beefy Miracle)",
- "fedora-18" => "Fedora 18 (Spherical Cow)",
- "fedora-19" => "Fedora 19 (Schr��dinger's Cat)",
- "fedora-20" => "Fedora 20 (Heisenbug)",
- "fedora-21" => "Fedora 21",
"rpath" => "rPath Linux",
"ark" => "Ark Linux",
};
@@ -124,7 +144,9 @@
my %distmap =
("Debian" => "debian"),
- ("Mandrake" => "mandrake");
+ ("Mandrake" => "mandrake"),
+ ("Conectiva" => "conectiva"),
+ ("Blackpanther" => "blackpanther");
# gst_prefix not required here: parse already does that for us.
$dist = lc (&gst_parse_sh ("/etc/lsb-release", "DISTRIB_ID"));
@@ -292,6 +314,57 @@
return -1;
}
+sub check_yoper
+{
+ open YOPER, "$gst_prefix/etc/yoper-release" or return -1;
+ while (<YOPER>)
+ {
+ $ver = $_;
+ chomp ($ver);
+ if ($ver =~ m/Yoper (\S+)/)
+ {
+ close YOPER;
+ # find the first digit of our release
+ $mystring= ~m/(\d)/;
+ #store it in $fdigit
+ $fdigit= $1;
+ # the end of the release is marked with -2 so find the -
+ $end = index($ver,"-");
+ $start = index($ver,$fdigit);
+ # extract the substring into $newver
+ $newver= substr($ver,$start,$end-$start);
+ print $newver;
+ return "yoper-$newver";
+ }
+ }
+ close YOPER;
+ return -1;
+}
+
+sub check_blackpanther
+{
+ open BLACKPANTHER, "$gst_prefix/etc/blackPanther-release" or return -1;
+
+ while (<BLACKPANTHER>)
+ {
+ $ver = $_;
+ chomp ($ver);
+ if ($ver =~ /^Linux Black Panther release (\S+)/)
+ {
+ close BLACKPANTHER;
+ return "blackPanther-$1";
+ }
+ elsif ($ver =~ /^Black Panther ( L|l)inux release ([\d\.]+)/i)
+ {
+ close BLACKPANTHER;
+ return "blackPanther-$2";
+ }
+ }
+
+ close BLACKPANTHER;
+ return -1;
+}
+
sub check_fedora
{
open FEDORA, "$gst_prefix/etc/fedora-release" or return -1;
@@ -337,6 +410,25 @@
close RPATH;
return -1;
+}
+
+sub check_conectiva
+{
+ open RELEASE, "$gst_prefix/etc/conectiva-release" or return -1;
+
+ while (<RELEASE>)
+ {
+ chomp;
+
+ if (/^Conectiva Linux (\S+)/)
+ {
+ close RELEASE;
+ return "conectiva-$1";
+ }
+ }
+
+ close RELEASE;
+ return -1;
}
sub check_turbolinux
@@ -524,8 +616,8 @@
my %check = (
# Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther
- "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_vine,
- \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna,
+ "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine,
+ \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna,
\&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ],
"FreeBSD" => [ \&check_freebsd ],
"SunOS" => [ \&check_solaris ]
|
||
| 8d0dc05b | 2014-12-04 10:29:43 | Timothy Pearson |
Add new distributions to TDE network configuration utility |
||
|
M knetworkconf/backends/network-conf.in M knetworkconf/backends/network.pl.in M knetworkconf/backends/platform.pl.in M knetworkconf/backends/service.pl.in |
||
diff --git a/knetworkconf/backends/network-conf.in b/knetworkconf/backends/network-conf.in
index ffea2cf..0f5e52d 100755
--- a/knetworkconf/backends/network-conf.in
+++ b/knetworkconf/backends/network-conf.in
@@ -63,24 +63,25 @@
$version = "@VERSION@";
@platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", "redhat-7.1",
"redhat-7.2", "redhat-8.0", "redhat-9",
- "rhel-5", "rhel-6",
+ "rhel-5", "rhel-6", "rhel-7",
"openna-1.0",
** Diff limit reached (max: 250 lines) **
|
||