summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-06-12 04:16:20 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-06-12 04:16:20 +0200
commit59394e6b2950b9178cc3e99c6eea49af7a8d5917 (patch)
tree7b60d48b2d38dd89b2c8f409619465e94981200e
parentf0594c064a6d98f4eb1e40f312d38791b279cc44 (diff)
downloadtdeadmin-59394e6b2950b9178cc3e99c6eea49af7a8d5917.tar.gz
tdeadmin-59394e6b2950b9178cc3e99c6eea49af7a8d5917.zip
Update network configuration support for RHEL/Fedora
Thanks to Francois Andriot for the patch!
-rwxr-xr-xknetworkconf/backends/network-conf.in3
-rw-r--r--knetworkconf/backends/network.pl.in35
-rw-r--r--knetworkconf/backends/platform.pl.in33
-rw-r--r--knetworkconf/backends/service.pl.in26
4 files changed, 94 insertions, 3 deletions
diff --git a/knetworkconf/backends/network-conf.in b/knetworkconf/backends/network-conf.in
index 2f76e9d..df4ba18 100755
--- a/knetworkconf/backends/network-conf.in
+++ b/knetworkconf/backends/network-conf.in
@@ -63,6 +63,7 @@ $name = "network";
$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",
"openna-1.0",
"mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1", "mandrake-9.2",
"mandrake-10.0", "mandrake-10.1","mandrake-10.2", "mandriva-2006.0",
@@ -72,7 +73,7 @@ $version = "@VERSION@";
"debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", "debian-testing",
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-8.10", "ubuntu-9.04", "ubuntu-9.10", "ubuntu-10.04", "ubuntu-10.10",
"suse-7.0", "suse-9.0", "suse-9.1",
- "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
+ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "fedora-15", "fedora-16", "fedora-17",
"pld-1.0", "pld-1.1", "pld-1.99",
"conectiva-9", "conectiva-10",
"vine-3.0", "vine-3.1",
diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in
index d0a5ddd..f48c3b8 100644
--- a/knetworkconf/backends/network.pl.in
+++ b/knetworkconf/backends/network.pl.in
@@ -492,6 +492,8 @@ sub gst_network_get_broadcast_ping_cmd
"redhat-7.2" => "redhat-6.2",
"redhat-8.0" => "redhat-6.2",
"redhat-9" => "redhat-6.2",
+ "rhel-5" => "redhat-6.2",
+ "rhel-6" => "redhat-6.2",
"openna-1.0" => "redhat-6.2",
"debian-2.2" => "debian-2.2",
"debian-3.0" => "debian-2.2",
@@ -538,6 +540,9 @@ sub gst_network_get_broadcast_ping_cmd
"fedora-3" => "redhat-6.2",
"fedora-4" => "redhat-6.2",
"fedora-5" => "redhat-6.2",
+ "fedora-15" => "redhat-6.2",
+ "fedora-16" => "redhat-6.2",
+ "fedora-17" => "redhat-6.2",
"rpath" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
"vine-3.1" => "redhat-6.2",
@@ -1817,6 +1822,8 @@ sub gst_network_get_file
"redhat-7.2" => \&gst_network_rh72_get_file,
"redhat-8.0" => \&gst_network_rh72_get_file,
"redhat-9" => \&gst_network_rh72_get_file,
+ "rhel-5" => \&gst_network_rh72_get_file,
+ "rhel-6" => \&gst_network_rh72_get_file,
"openna-1.0" => \&gst_network_rh62_get_file,
"mandrake-7.2" => \&gst_network_rh62_get_file,
"mandrake-7.1" => \&gst_network_rh62_get_file,
@@ -1864,6 +1871,9 @@ sub gst_network_get_file
"fedora-3" => \&gst_network_rh72_get_file,
"fedora-4" => \&gst_network_rh72_get_file,
"fedora-5" => \&gst_network_rh72_get_file,
+ "fedora-15" => \&gst_network_rh72_get_file,
+ "fedora-16" => \&gst_network_rh72_get_file,
+ "fedora-17" => \&gst_network_rh72_get_file,
"rpath" => \&gst_network_rh72_get_file,
"vine-3.0" => \&gst_network_rh62_get_file,
"vine-3.1" => \&gst_network_rh62_get_file,
@@ -3963,6 +3973,8 @@ sub gst_network_ensure_loopback_interface
"redhat-7.2" => "lo",
"redhat-8.0" => "lo",
"redhat-9" => "",
+ "rhel-5" => "",
+ "rhel-6" => "",
"openna-1.0" => "lo",
"mandrake-7.1" => "lo",
"mandrake-7.2" => "lo",
@@ -4010,6 +4022,9 @@ sub gst_network_ensure_loopback_interface
"fedora-3" => "",
"fedora-4" => "",
"fedora-5" => "",
+ "fedora-15" => "",
+ "fedora-16" => "",
+ "fedora-17" => "",
"rpath" => "",
"vine-3.0" => "lo",
"vine-3.1" => "lo",
@@ -4153,6 +4168,8 @@ sub gst_network_get_parse_table
"redhat-7.2" => "redhat-7.2",
"redhat-8.0" => "redhat-7.2",
"redhat-9" => "redhat-7.2",
+ "rhel-5" => "redhat-7.2",
+ "rhel-6" => "redhat-7.2",
"openna-1.0" => "redhat-6.2",
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
@@ -4200,6 +4217,9 @@ sub gst_network_get_parse_table
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-15" => "redhat-7.2",
+ "fedora-16" => "redhat-7.2",
+ "fedora-17" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -4589,6 +4609,8 @@ sub gst_network_get_interface_parse_table
"redhat-7.2" => "redhat-7.2",
"redhat-8.0" => "redhat-8.0",
"redhat-9" => "redhat-8.0",
+ "rhel-5" => "redhat-8.0",
+ "rhel-6" => "redhat-8.0",
"openna-1.0" => "redhat-6.2",
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
@@ -4636,6 +4658,9 @@ sub gst_network_get_interface_parse_table
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-15" => "redhat-7.2",
+ "fedora-16" => "redhat-7.2",
+ "fedora-17" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
@@ -5450,6 +5475,8 @@ sub gst_network_get_replace_table
"redhat-7.2" => "redhat-7.2",
"redhat-8.0" => "redhat-7.2",
"redhat-9" => "redhat-7.2",
+ "rhel-5" => "redhat-7.2",
+ "rhel-6" => "redhat-7.2",
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
"mandrake-9.0" => "redhat-7.0",
@@ -5496,6 +5523,9 @@ sub gst_network_get_replace_table
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-15" => "redhat-7.2",
+ "fedora-16" => "redhat-7.2",
+ "fedora-17" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -5878,6 +5908,8 @@ sub gst_network_get_interface_replace_table
"redhat-7.2" => "redhat-7.2",
"redhat-8.0" => "redhat-8.0",
"redhat-9" => "redhat-8.0",
+ "rhel-5" => "redhat-8.0",
+ "rhel-6" => "redhat-8.0",
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
"mandrake-9.0" => "mandrake-9.0",
@@ -5924,6 +5956,9 @@ sub gst_network_get_interface_replace_table
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-15" => "redhat-7.2",
+ "fedora-16" => "redhat-7.2",
+ "fedora-17" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
diff --git a/knetworkconf/backends/platform.pl.in b/knetworkconf/backends/platform.pl.in
index a3b52bb..7c8269e 100644
--- a/knetworkconf/backends/platform.pl.in
+++ b/knetworkconf/backends/platform.pl.in
@@ -71,6 +71,8 @@ $PLATFORM_INFO = {
"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",
"openna-1.0" => "OpenNA Linux 1.0 VSLC",
"mandrake-7.1" => "Linux Mandrake 7.1",
"mandrake-7.2" => "Linux Mandrake 7.2 Odyssey",
@@ -123,6 +125,9 @@ $PLATFORM_INFO = {
"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)",
"rpath" => "rPath Linux",
"ark" => "Ark Linux",
};
@@ -191,6 +196,27 @@ sub check_redhat
return -1;
}
+sub check_rhel
+{
+ open RELEASE, "$gst_prefix/etc/redhat-release" or return -1;
+ while (<RELEASE>)
+ {
+ chomp;
+ if (
+ (/^CentOS release (\d)([\d\.]+)\s+.*/)
+ or (/^Scientific Linux release (\d)([\d\.]+)\s+.*/)
+ or (/^Red Hat Enterprise Linux \w release (\d)([\d\.]+)\s+.*/)
+ )
+ {
+ close RELEASE;
+ return "rhel-$1";
+ }
+ }
+ close RELEASE;
+ return -1;
+}
+
+
sub check_openna
{
open OPENNA, "$gst_prefix/etc/openna-release" or return -1;
@@ -343,7 +369,10 @@ sub check_fedora
$ver = $_;
chomp ($ver);
- if ($ver =~ /^Fedora Core release (\S+)/)
+ if (
+ ($ver =~ /^Fedora Core release (\S+)/)
+ or ($ver =~ /^Fedora release (\S+)/)
+ )
{
close FEDORA;
return "fedora-$1";
@@ -584,7 +613,7 @@ sub gst_platform_guess
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_blackpanther, \&check_vine,
- \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna,
+ \&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 ]
diff --git a/knetworkconf/backends/service.pl.in b/knetworkconf/backends/service.pl.in
index 85b2cce..a6fa428 100644
--- a/knetworkconf/backends/service.pl.in
+++ b/knetworkconf/backends/service.pl.in
@@ -59,6 +59,9 @@ sub gst_service_sysv_get_paths
"redhat-8.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"redhat-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"openna-1.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+
+ "rhel-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "rhel-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"mandrake-7.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"mandrake-7.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -110,6 +113,10 @@ sub gst_service_sysv_get_paths
"fedora-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"rpath" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "fedora-15" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "fedora-16" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "fedora-17" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+
"vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"vine-3.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"ark" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -139,6 +146,9 @@ sub gst_service_sysv_get_runlevels
"redhat-9" => [3, 5],
"openna-1.0" => [3, 5],
+ "rhel-5" => [3, 5],
+ "rhel-6" => [3, 5],
+
"mandrake-7.1" => [3, 5],
"mandrake-7.2" => [3, 5],
"mandrake-9.0" => [3, 5],
@@ -189,6 +199,10 @@ sub gst_service_sysv_get_runlevels
"fedora-4" => [3, 5],
"fedora-5" => [3, 5],
"rpath" => [3, 5],
+
+ "fedora-15" => [3, 5],
+ "fedora-16" => [3, 5],
+ "fedora-17" => [3, 5],
"vine-3.0" => [3, 5],
"vine-3.1" => [3, 5],
@@ -218,6 +232,9 @@ sub gst_service_get_runlevel_roles
"redhat-9" => "redhat-5.2",
"openna-1.0" => "redhat-5.2",
+ "rhel-5" => "redhat-5.2",
+ "rhel-6" => "redhat-5.2",
+
"mandrake-7.1" => "redhat-5.2",
"mandrake-7.2" => "redhat-5.2",
"mandrake-9.0" => "redhat-5.2",
@@ -267,6 +284,10 @@ sub gst_service_get_runlevel_roles
"fedora-5" => "redhat-5.2",
"rpath" => "redhat-5.2",
+ "fedora-15" => "redhat-5.2",
+ "fedora-16" => "redhat-5.2",
+ "fedora-17" => "redhat-5.2",
+
"vine-3.0" => "redhat-5.2",
"vine-3.1" => "redhat-5.2",
"ark" => "redhat-5.2",
@@ -1751,12 +1772,17 @@ sub gst_service_get_status
"redhat-7.3" => \&gst_service_redhat_get_status,
"redhat-8.0" => \&gst_service_redhat_get_status,
"redhat-9" => \&gst_service_redhat_get_status,
+ "rhel-5" => \&gst_service_redhat_get_status,
+ "rhel-6" => \&gst_service_redhat_get_status,
"mandrake-7.2" => \&gst_service_redhat_get_status,
"fedora-1" => \&gst_service_redhat_get_status,
"fedora-2" => \&gst_service_redhat_get_status,
"fedora-3" => \&gst_service_redhat_get_status,
"fedora-4" => \&gst_service_redhat_get_status,
"fedora-5" => \&gst_service_redhat_get_status,
+ "fedora-15" => \&gst_service_redhat_get_status,
+ "fedora-16" => \&gst_service_redhat_get_status,
+ "fedora-17" => \&gst_service_redhat_get_status,
"rpath" => \&gst_service_redhat_get_status,