Hi, Here I send a patch that adds support to the network backend for the following platforms: - Yoper Linux 2.2 - Ark Linux - Mandriva 2006.0 and 2006.1 (Cooker) - Fedora 4 - Ubuntu/Kubuntu 5.10 and 6.04. Also the Yoper Linux logo is attached. PLEASE, PLEASE, PLEASE review the patch soon, more than six months ago I sent the yoper linux patch and I never got any feedback about it, and now when I applied it again against the current CVS tree it conflicted and I had to redo it all over again, I don't want to have to do the same with this patch that is a lot bigger than that old one. The patch is against 12-18-2005. Cheers -- Juan Luis Baptiste http://www.merlinux.org http://knetworkconf.sf.net
? configure.in.in
? yoper2.2-ark-mandriva2006.0_cooker-fedora4-kubuntu5.10_6.04.diff
Index: network-conf.in
===================================================================
RCS file: /cvs/system-tools-backends/system-tools-backends/network-conf.in,v
retrieving revision 1.117
diff -u -3 -p -r1.117 network-conf.in
--- network-conf.in 21 Nov 2005 01:27:32 -0000 1.117
+++ network-conf.in 19 Dec 2005 04:27:42 -0000
@@ -65,15 +65,17 @@ $version = "@VERSION@";
"redhat-7.2", "redhat-8.0", "redhat-9",
"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.0", "mandrake-10.1","mandrake-10.2", "mandriva-2006.0", "mandriva-2006.1",
+ "yoper-2.2",
"blackpanther-4.0",
"debian-2.2", "debian-3.0", "debian-sarge",
- "ubuntu-5.04",
+ "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.04",
"suse-7.0", "suse-9.0", "suse-9.1",
- "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "rpath",
+ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "rpath",
"pld-1.0", "pld-1.1", "pld-1.99",
"conectiva-9", "conectiva-10",
"vine-3.0", "vine-3.1",
+ "ark",
"slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
"gentoo", "vlos-1.2", "freebsd-5", "freebsd-6");
Index: network.pl.in
===================================================================
RCS file: /cvs/system-tools-backends/system-tools-backends/network.pl.in,v
retrieving revision 1.212
diff -u -3 -p -r1.212 network.pl.in
--- network.pl.in 21 Nov 2005 01:27:32 -0000 1.212
+++ network.pl.in 19 Dec 2005 04:27:45 -0000
@@ -497,6 +497,7 @@ sub gst_network_get_broadcast_ping_cmd
"debian-3.0" => "debian-2.2",
"debian-sarge" => "debian-2.2",
"ubuntu-5.04" => "debian-2.2",
+ "ubuntu-6.04" => "debian-2.2",
"mandrake-7.1" => "debian-2.2",
"mandrake-7.2" => "debian-2.2",
"mandrake-9.0" => "debian-2.2",
@@ -504,6 +505,10 @@ sub gst_network_get_broadcast_ping_cmd
"mandrake-9.2" => "debian-2.2",
"mandrake-10.0" => "debian-2.2",
"mandrake-10.1" => "redhat-6.2",
+ "mandrake-10.2" => "redhat-6.2",
+ "mandriva-2006.0" => "redhat-6.2",
+ "mandriva-2006.1" => "redhat-6.2",
+ "yoper-2.2" => "redhat-6.2",
"blackpanther-4.0" => "debian-2.2",
"suse-7.0" => "debian-2.2",
"suse-9.0" => "redhat-6.2",
@@ -516,9 +521,11 @@ sub gst_network_get_broadcast_ping_cmd
"fedora-1" => "redhat-6.2",
"fedora-2" => "redhat-6.2",
"fedora-3" => "redhat-6.2",
+ "fedora-4" => "redhat-6.2",
"rpath" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
"vine-3.1" => "redhat-6.2",
+ "ark" => "redhat-6.2",
"slackware-9.1.0" => "redhat-6.2",
"slackware-10.0.0" => "redhat-6.2",
"slackware-10.1.0" => "redhat-6.2",
@@ -1779,50 +1786,58 @@ sub gst_network_get_file
my %dist_map =
(
- "redhat-6.0" => \&gst_network_rh62_get_file,
- "redhat-6.1" => \&gst_network_rh62_get_file,
- "redhat-6.2" => \&gst_network_rh62_get_file,
- "redhat-7.0" => \&gst_network_rh62_get_file,
- "redhat-7.1" => \&gst_network_rh62_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,
- "openna-1.0" => \&gst_network_rh62_get_file,
- "mandrake-7.2" => \&gst_network_rh62_get_file,
- "mandrake-7.1" => \&gst_network_rh62_get_file,
- "mandrake-9.0" => \&gst_network_rh62_get_file,
- "mandrake-9.1" => \&gst_network_rh62_get_file,
- "mandrake-9.2" => \&gst_network_rh62_get_file,
- "mandrake-10.0" => \&gst_network_rh62_get_file,
- "mandrake-10.1" => \&gst_network_rh62_get_file,
- "blackpanther-4.0" => \&gst_network_rh62_get_file,
- "conectiva-9" => \&gst_network_rh62_get_file,
- "conectiva-10" => \&gst_network_rh62_get_file,
- "debian-2.2" => \&gst_network_deb22_get_file,
- "debian-3.0" => \&gst_network_deb22_get_file,
- "debian-sarge" => \&gst_network_deb22_get_file,
- "ubuntu-5.04" => \&gst_network_deb22_get_file,
- "suse-7.0" => \&gst_network_suse70_get_file,
- "suse-9.0" => \&gst_network_deb22_get_file,
- "suse-9.1" => \&gst_network_deb22_get_file,
- "turbolinux-7.0" => \&gst_network_rh62_get_file,
- "pld-1.0" => \&gst_network_pld10_get_file,
- "pld-1.1" => \&gst_network_pld10_get_file,
- "pld-1.99" => \&gst_network_pld10_get_file,
- "fedora-1" => \&gst_network_rh72_get_file,
- "fedora-2" => \&gst_network_rh72_get_file,
- "fedora-3" => \&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,
- "slackware-9.1.0" => \&gst_network_deb22_get_file,
- "slackware-10.0.0" => \&gst_network_deb22_get_file,
- "slackware-10.1.0" => \&gst_network_deb22_get_file,
- "slackware-10.2.0" => \&gst_network_deb22_get_file,
- "gentoo" => \&gst_network_deb22_get_file,
- "freebsd-5" => \&gst_network_deb22_get_file,
- "freebsd-6" => \&gst_network_deb22_get_file,
- );
+ "redhat-6.0" => \&gst_network_rh62_get_file,
+ "redhat-6.1" => \&gst_network_rh62_get_file,
+ "redhat-6.2" => \&gst_network_rh62_get_file,
+ "redhat-7.0" => \&gst_network_rh62_get_file,
+ "redhat-7.1" => \&gst_network_rh62_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,
+ "openna-1.0" => \&gst_network_rh62_get_file,
+ "mandrake-7.2" => \&gst_network_rh62_get_file,
+ "mandrake-7.1" => \&gst_network_rh62_get_file,
+ "mandrake-9.0" => \&gst_network_rh62_get_file,
+ "mandrake-9.1" => \&gst_network_rh62_get_file,
+ "mandrake-9.2" => \&gst_network_rh62_get_file,
+ "mandrake-10.0" => \&gst_network_rh62_get_file,
+ "mandrake-10.1" => \&gst_network_rh62_get_file,
+ "mandrake-10.2" => \&gst_network_rh62_get_file,
+ "mandriva-2006.0" => \&gst_network_rh62_get_file,
+ "mandriva-2006.1" => \&gst_network_rh62_get_file,
+ "yoper-2.2" => \&gst_network_rh62_get_file,
+ "blackpanther-4.0" => \&gst_network_rh62_get_file,
+ "conectiva-9" => \&gst_network_rh62_get_file,
+ "conectiva-10" => \&gst_network_rh62_get_file,
+ "debian-2.2" => \&gst_network_deb22_get_file,
+ "debian-3.0" => \&gst_network_deb22_get_file,
+ "debian-sarge" => \&gst_network_deb22_get_file,
+ "ubuntu-5.04" => \&gst_network_deb22_get_file,
+ "ubuntu-5.10" => \&gst_network_deb22_get_file,
+ "ubuntu-6.04" => \&gst_network_deb22_get_file,
+ "suse-7.0" => \&gst_network_suse70_get_file,
+ "suse-9.0" => \&gst_network_deb22_get_file,
+ "suse-9.1" => \&gst_network_deb22_get_file,
+ "turbolinux-7.0" => \&gst_network_rh62_get_file,
+ "pld-1.0" => \&gst_network_pld10_get_file,
+ "pld-1.1" => \&gst_network_pld10_get_file,
+ "pld-1.99" => \&gst_network_pld10_get_file,
+ "fedora-1" => \&gst_network_rh72_get_file,
+ "fedora-2" => \&gst_network_rh72_get_file,
+ "fedora-3" => \&gst_network_rh72_get_file,
+ "fedora-4" => \&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,
+ "ark" => \&gst_network_rh62_get_file,
+ "slackware-9.1.0" => \&gst_network_deb22_get_file,
+ "slackware-10.0.0" => \&gst_network_deb22_get_file,
+ "slackware-10.1.0" => \&gst_network_deb22_get_file,
+ "slackware-10.2.0" => \&gst_network_deb22_get_file,
+ "gentoo" => \&gst_network_deb22_get_file,
+ "freebsd-5" => \&gst_network_deb22_get_file,
+ "freebsd-6" => \&gst_network_deb22_get_file,
+ );
$proc = $dist_map{$gst_dist};
@@ -3889,53 +3904,61 @@ sub gst_network_ensure_loopback_interfac
my ($interface) = @_;
my $dev;
my %dist_map =
- (
- "redhat-5.2" => "lo",
- "redhat-6.0" => "lo",
- "redhat-6.1" => "lo",
- "redhat-6.2" => "lo",
- "redhat-7.0" => "lo",
- "redhat-7.1" => "lo",
- "redhat-7.2" => "lo",
- "redhat-8.0" => "lo",
- "redhat-9" => "",
- "openna-1.0" => "lo",
- "mandrake-7.1" => "lo",
- "mandrake-7.2" => "lo",
- "mandrake-9.0" => "lo",
- "mandrake-9.1" => "lo",
- "mandrake-9.2" => "lo",
- "mandrake-10.0" => "lo",
- "mandrake-10.1" => "lo",
- "blackpanther-4.0" => "lo",
- "conectiva-9" => "lo",
- "conectiva-10" => "lo",
- "debian-2.2" => "lo",
- "debian-3.0" => "lo",
- "debian-sarge" => "lo",
- "ubuntu-5.04" => "lo",
- "suse-7.0" => "",
- "suse-9.0" => "",
- "suse-9.1" => "",
+ (
+ "redhat-5.2" => "lo",
+ "redhat-6.0" => "lo",
+ "redhat-6.1" => "lo",
+ "redhat-6.2" => "lo",
+ "redhat-7.0" => "lo",
+ "redhat-7.1" => "lo",
+ "redhat-7.2" => "lo",
+ "redhat-8.0" => "lo",
+ "redhat-9" => "",
+ "openna-1.0" => "lo",
+ "mandrake-7.1" => "lo",
+ "mandrake-7.2" => "lo",
+ "mandrake-9.0" => "lo",
+ "mandrake-9.1" => "lo",
+ "mandrake-9.2" => "lo",
+ "mandrake-10.0" => "lo",
+ "mandrake-10.1" => "lo",
+ "mandrake-10.2" => "lo",
+ "mandriva-2006.0" => "lo",
+ "mandriva-2006.1" => "lo",
+ "yoper-2.2" => "lo",
+ "blackpanther-4.0" => "lo",
+ "conectiva-9" => "lo",
+ "conectiva-10" => "lo",
+ "debian-2.2" => "lo",
+ "debian-3.0" => "lo",
+ "debian-sarge" => "lo",
+ "ubuntu-5.04" => "lo",
+ "ubuntu-5.10" => "lo",
+ "ubuntu-6.04" => "lo",
+ "suse-7.0" => "",
+ "suse-9.0" => "",
+ "suse-9.1" => "",
"turbolinux-7.0" => "lo",
- "pld-1.0" => "lo",
- "pld-1.1" => "lo",
- "pld-1.99" => "lo",
- "fedora-1" => "",
- "fedora-2" => "",
- "fedora-3" => "",
- "rpath" => "",
- "vine-3.0" => "lo",
- "vine-3.1" => "lo",
- "slackware-9.1.0" => "",
- "slackware-10.0.0" => "",
- "slackware-10.1.0" => "",
- "slackware-10.2.0" => "",
- "gentoo" => "",
- "vlos-1.2" => "",
- "freebsd-5" => "",
- "freebsd-6" => "",
- );
+ "pld-1.0" => "lo",
+ "pld-1.1" => "lo",
+ "pld-1.99" => "lo",
+ "fedora-1" => "",
+ "fedora-2" => "",
+ "fedora-3" => "",
+ "fedora-4" => "",
+ "rpath" => "",
+ "vine-3.0" => "lo",
+ "vine-3.1" => "lo",
+ "ark" => "lo",
+ "slackware-9.1.0" => "",
+ "slackware-10.0.0" => "",
+ "slackware-10.1.0" => "",
+ "slackware-10.2.0" => "",
+ "gentoo" => "",
+ "vlos-1.2" => "",
+ "freebsd-5" => "",
+ "freebsd-6" => "",
+ );
$dev = $dist_map {$gst_dist};
@@ -4046,53 +4069,61 @@ sub gst_network_ensure_loopback
sub gst_network_get_parse_table
{
my %dist_map =
- (
- "redhat-5.2" => "redhat-6.2",
+ (
+ "redhat-5.2" => "redhat-6.2",
"redhat-6.0" => "redhat-6.2",
"redhat-6.1" => "redhat-6.2",
"redhat-6.2" => "redhat-6.2",
"redhat-7.0" => "redhat-7.0",
"redhat-7.1" => "redhat-7.0",
"redhat-7.2" => "redhat-7.2",
- "redhat-8.0" => "redhat-7.2",
- "redhat-9" => "redhat-7.2",
+ "redhat-8.0" => "redhat-7.2",
+ "redhat-9" => "redhat-7.2",
"openna-1.0" => "redhat-6.2",
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
- "mandrake-9.0" => "redhat-7.0",
- "mandrake-9.1" => "redhat-7.0",
- "mandrake-9.2" => "redhat-7.0",
- "mandrake-10.0" => "redhat-7.0",
- "mandrake-10.1" => "redhat-7.0",
- "blackpanther-4.0" => "redhat-7.0",
- "conectiva-9" => "redhat-7.0",
- "conectiva-10" => "redhat-7.0",
- "debian-2.2" => "debian-2.2",
- "debian-3.0" => "debian-2.2",
- "debian-sarge" => "debian-2.2",
- "ubuntu-5.04" => "debian-2.2",
- "suse-7.0" => "suse-7.0",
- "suse-9.0" => "suse-9.0",
- "suse-9.1" => "suse-9.0",
- "turbolinux-7.0" => "redhat-7.0",
- "pld-1.0" => "pld-1.0",
- "pld-1.1" => "pld-1.0",
- "pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
- "rpath" => "redhat-7.2",
- "vine-3.0" => "redhat-7.0",
- "vine-3.1" => "redhat-7.0",
- "slackware-9.1.0" => "slackware-9.1.0",
- "slackware-10.0.0" => "slackware-9.1.0",
- "slackware-10.1.0" => "slackware-9.1.0",
- "slackware-10.2.0" => "slackware-9.1.0",
- "gentoo" => "gentoo",
- "vlos-1.2" => "gentoo",
- "freebsd-5" => "freebsd-5",
- "freebsd-6" => "freebsd-5",
- );
+ "mandrake-9.0" => "redhat-7.0",
+ "mandrake-9.1" => "redhat-7.0",
+ "mandrake-9.2" => "redhat-7.0",
+ "mandrake-10.0" => "redhat-7.0",
+ "mandrake-10.1" => "redhat-7.0",
+ "mandrake-10.2" => "redhat-7.0",
+ "mandriva-2006.0" => "redhat-7.0",
+ "mandriva-2006.1" => "redhat-7.0",
+ "yoper-2.2" => "redhat-7.0",
+ "blackpanther-4.0" => "redhat-7.0",
+ "conectiva-9" => "redhat-7.0",
+ "conectiva-10" => "redhat-7.0",
+ "debian-2.2" => "debian-2.2",
+ "debian-3.0" => "debian-2.2",
+ "debian-sarge" => "debian-2.2",
+ "ubuntu-5.04" => "debian-2.2",
+ "ubuntu-5.10" => "debian-2.2",
+ "ubuntu-6.04" => "debian-2.2",
+ "suse-7.0" => "suse-7.0",
+ "suse-9.0" => "suse-9.0",
+ "suse-9.1" => "suse-9.0",
+ "turbolinux-7.0" => "redhat-7.0",
+ "pld-1.0" => "pld-1.0",
+ "pld-1.1" => "pld-1.0",
+ "pld-1.99" => "pld-1.0",
+ "fedora-1" => "redhat-7.2",
+ "fedora-2" => "redhat-7.2",
+ "fedora-3" => "redhat-7.2",
+ "fedora-4" => "redhat-7.2",
+ "rpath" => "redhat-7.2",
+ "vine-3.0" => "redhat-7.0",
+ "vine-3.1" => "redhat-7.0",
+ "ark" => "redhat-7.0",
+ "slackware-9.1.0" => "slackware-9.1.0",
+ "slackware-10.0.0" => "slackware-9.1.0",
+ "slackware-10.1.0" => "slackware-9.1.0",
+ "slackware-10.2.0" => "slackware-9.1.0",
+ "gentoo" => "gentoo",
+ "vlos-1.2" => "gentoo",
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5",
+ );
my %dist_tables =
(
@@ -4459,53 +4490,61 @@ sub gst_network_get_parse_table
sub gst_network_get_interface_parse_table
{
my %dist_map =
- (
- "redhat-5.2" => "redhat-6.2",
+ (
+ "redhat-5.2" => "redhat-6.2",
"redhat-6.0" => "redhat-6.2",
"redhat-6.1" => "redhat-6.2",
"redhat-6.2" => "redhat-6.2",
"redhat-7.0" => "redhat-6.2",
"redhat-7.1" => "redhat-6.2",
"redhat-7.2" => "redhat-7.2",
- "redhat-8.0" => "redhat-8.0",
- "redhat-9" => "redhat-8.0",
+ "redhat-8.0" => "redhat-8.0",
+ "redhat-9" => "redhat-8.0",
"openna-1.0" => "redhat-6.2",
"mandrake-7.1" => "redhat-6.2",
- "mandrake-7.2" => "redhat-6.2",
- "mandrake-9.0" => "mandrake-9.0",
- "mandrake-9.1" => "mandrake-9.0",
- "mandrake-9.2" => "mandrake-9.0",
- "mandrake-10.0" => "mandrake-9.0",
- "mandrake-10.1" => "mandrake-9.0",
- "blackpanther-4.0" => "mandrake-9.0",
- "conectiva-9" => "conectiva-9",
- "conectiva-10" => "conectiva-9",
- "debian-2.2" => "debian-2.2",
- "debian-3.0" => "debian-3.0",
- "debian-sarge" => "debian-3.0",
- "ubuntu-5.04" => "debian-3.0",
- "suse-7.0" => "suse-7.0",
- "suse-9.0" => "suse-9.0",
- "suse-9.1" => "suse-9.0",
- "turbolinux-7.0" => "redhat-6.2",
- "pld-1.0" => "pld-1.0",
- "pld-1.1" => "pld-1.0",
- "pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
- "rpath" => "redhat-7.2",
- "vine-3.0" => "vine-3.0",
- "vine-3.1" => "vine-3.0",
- "slackware-9.1.0" => "slackware-9.1.0",
- "slackware-10.0.0" => "slackware-9.1.0",
- "slackware-10.1.0" => "slackware-9.1.0",
- "slackware-10.2.0" => "slackware-9.1.0",
- "gentoo" => "gentoo",
- "vlos-1.2" => "gentoo",
- "freebsd-5" => "freebsd-5",
- "freebsd-6" => "freebsd-5",
- );
+ "mandrake-7.2" => "redhat-6.2",
+ "mandrake-9.0" => "mandrake-9.0",
+ "mandrake-9.1" => "mandrake-9.0",
+ "mandrake-9.2" => "mandrake-9.0",
+ "mandrake-10.0" => "mandrake-9.0",
+ "mandrake-10.1" => "mandrake-9.0",
+ "mandrake-10.2" => "mandrake-9.0",
+ "mandriva-2006.0" => "mandrake-9.0",
+ "mandriva-2006.1" => "mandrake-9.0",
+ "yoper-2.2" => "redhat-6.2",
+ "blackpanther-4.0" => "mandrake-9.0",
+ "conectiva-9" => "conectiva-9",
+ "conectiva-10" => "conectiva-9",
+ "debian-2.2" => "debian-2.2",
+ "debian-3.0" => "debian-3.0",
+ "debian-sarge" => "debian-3.0",
+ "ubuntu-5.04" => "debian-3.0",
+ "ubuntu-5.10" => "debian-3.0",
+ "ubuntu-6.04" => "debian-3.0",
+ "suse-7.0" => "suse-7.0",
+ "suse-9.0" => "suse-9.0",
+ "suse-9.1" => "suse-9.0",
+ "turbolinux-7.0" => "redhat-6.2",
+ "pld-1.0" => "pld-1.0",
+ "pld-1.1" => "pld-1.0",
+ "pld-1.99" => "pld-1.0",
+ "fedora-1" => "redhat-7.2",
+ "fedora-2" => "redhat-7.2",
+ "fedora-3" => "redhat-7.2",
+ "fedora-4" => "redhat-7.2",
+ "rpath" => "redhat-7.2",
+ "vine-3.0" => "vine-3.0",
+ "vine-3.1" => "vine-3.0",
+ "ark" => "vine-3.0",
+ "slackware-9.1.0" => "slackware-9.1.0",
+ "slackware-10.0.0" => "slackware-9.1.0",
+ "slackware-10.1.0" => "slackware-9.1.0",
+ "slackware-10.2.0" => "slackware-9.1.0",
+ "gentoo" => "gentoo",
+ "vlos-1.2" => "gentoo",
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5",
+ );
my %dist_tables =
(
@@ -5298,44 +5337,52 @@ sub gst_network_get_replace_table
"redhat-7.0" => "redhat-7.0",
"redhat-7.1" => "redhat-7.0",
"redhat-7.2" => "redhat-7.2",
- "redhat-8.0" => "redhat-7.2",
- "redhat-9" => "redhat-7.2",
+ "redhat-8.0" => "redhat-7.2",
+ "redhat-9" => "redhat-7.2",
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
"mandrake-9.0" => "redhat-7.0",
"mandrake-9.1" => "redhat-7.0",
"mandrake-9.2" => "redhat-7.0",
- "mandrake-10.0" => "redhat-7.0",
- "mandrake-10.1" => "redhat-7.0",
- "blackpanther-4.0" => "redhat-7.0",
+ "mandrake-10.0" => "redhat-7.0",
+ "mandrake-10.1" => "redhat-7.0",
+ "mandrake-10.2" => "redhat-7.0",
+ "mandriva-2006.0" => "redhat-7.0",
+ "mandriva-2006.1" => "redhat-7.0",
+ "yoper-2.2" => "redhat-7.0",
+ "blackpanther-4.0" => "redhat-7.0",
"conectiva-9" => "redhat-7.0",
"conectiva-10" => "redhat-7.0",
- "debian-2.2" => "debian-2.2",
- "debian-3.0" => "debian-2.2",
- "debian-sarge" => "debian-2.2",
- "ubuntu-5.04" => "debian-2.2",
- "suse-7.0" => "suse-7.0",
- "suse-9.0" => "suse-9.0",
- "suse-9.1" => "suse-9.0",
+ "debian-2.2" => "debian-2.2",
+ "debian-3.0" => "debian-2.2",
+ "debian-sarge" => "debian-2.2",
+ "ubuntu-5.04" => "debian-2.2",
+ "ubuntu-5.10" => "debian-2.2",
+ "ubuntu-6.04" => "debian-2.2",
+ "suse-7.0" => "suse-7.0",
+ "suse-9.0" => "suse-9.0",
+ "suse-9.1" => "suse-9.0",
"turbolinux-7.0" => "redhat-7.0",
- "pld-1.0" => "pld-1.0",
- "pld-1.1" => "pld-1.0",
- "pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
- "rpath" => "redhat-7.2",
- "vine-3.0" => "redhat-7.0",
- "vine-3.1" => "redhat-7.0",
- "slackware-9.1.0" => "slackware-9.1.0",
- "slackware-10.0.0" => "slackware-9.1.0",
- "slackware-10.1.0" => "slackware-9.1.0",
- "slackware-10.2.0" => "slackware-9.1.0",
- "gentoo" => "gentoo",
- "vlos-1.2" => "gentoo",
- "freebsd-5" => "freebsd-5",
- "freebsd-6" => "freebsd-5",
- );
+ "pld-1.0" => "pld-1.0",
+ "pld-1.1" => "pld-1.0",
+ "pld-1.99" => "pld-1.0",
+ "fedora-1" => "redhat-7.2",
+ "fedora-2" => "redhat-7.2",
+ "fedora-3" => "redhat-7.2",
+ "fedora-4" => "redhat-7.2",
+ "rpath" => "redhat-7.2",
+ "vine-3.0" => "redhat-7.0",
+ "vine-3.1" => "redhat-7.0",
+ "ark" => "redhat-7.0",
+ "slackware-9.1.0" => "slackware-9.1.0",
+ "slackware-10.0.0" => "slackware-9.1.0",
+ "slackware-10.1.0" => "slackware-9.1.0",
+ "slackware-10.2.0" => "slackware-9.1.0",
+ "gentoo" => "gentoo",
+ "vlos-1.2" => "gentoo",
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5",
+ );
my %dist_tables =
(
@@ -5688,52 +5735,60 @@ sub gst_network_get_replace_table
sub gst_network_get_interface_replace_table
{
my %dist_map =
- (
- "redhat-5.2" => "redhat-5.2",
+ (
+ "redhat-5.2" => "redhat-5.2",
"redhat-6.0" => "redhat-6.2",
"redhat-6.1" => "redhat-6.2",
"redhat-6.2" => "redhat-6.2",
"redhat-7.0" => "redhat-6.2",
"redhat-7.1" => "redhat-6.2",
"redhat-7.2" => "redhat-7.2",
- "redhat-8.0" => "redhat-8.0",
- "redhat-9" => "redhat-8.0",
+ "redhat-8.0" => "redhat-8.0",
+ "redhat-9" => "redhat-8.0",
"mandrake-7.1" => "redhat-6.2",
- "mandrake-7.2" => "redhat-6.2",
- "mandrake-9.0" => "mandrake-9.0",
- "mandrake-9.1" => "mandrake-9.0",
- "mandrake-9.2" => "mandrake-9.0",
- "mandrake-10.0" => "mandrake-9.0",
- "mandrake-10.1" => "mandrake-9.0",
- "blackpanther-4.0" => "mandrake-9.0",
- "conectiva-9" => "conectiva-9",
- "conectiva-10" => "conectiva-9",
- "debian-2.2" => "debian-2.2",
- "debian-3.0" => "debian-3.0",
- "debian-sarge" => "debian-3.0",
- "ubuntu-5.04" => "debian-3.0",
- "suse-7.0" => "suse-7.0",
- "suse-9.0" => "suse-9.0",
- "suse-9.1" => "suse-9.0",
- "turbolinux-7.0" => "redhat-6.2",
- "pld-1.0" => "pld-1.0",
- "pld-1.1" => "pld-1.0",
- "pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
- "rpath" => "redhat-7.2",
- "vine-3.0" => "vine-3.0",
- "vine-3.1" => "vine-3.0",
- "slackware-9.1.0" => "slackware-9.1.0",
- "slackware-10.0.0" => "slackware-9.1.0",
- "slackware-10.1.0" => "slackware-9.1.0",
- "slackware-10.2.0" => "slackware-9.1.0",
- "gentoo" => "gentoo",
- "vlos-1.2" => "gentoo",
- "freebsd-5" => "freebsd-5",
- "freebsd-6" => "freebsd-5",
- );
+ "mandrake-7.2" => "redhat-6.2",
+ "mandrake-9.0" => "mandrake-9.0",
+ "mandrake-9.1" => "mandrake-9.0",
+ "mandrake-9.2" => "mandrake-9.0",
+ "mandrake-10.0" => "mandrake-9.0",
+ "mandrake-10.1" => "mandrake-9.0",
+ "mandrake-10.2" => "mandrake-9.0",
+ "mandriva-2006.0" => "mandrake-9.0",
+ "mandriva-2006.1" => "mandrake-9.0",
+ "yoper-2.2" => "redhat-6.2",
+ "blackpanther-4.0" => "mandrake-9.0",
+ "conectiva-9" => "conectiva-9",
+ "conectiva-10" => "conectiva-9",
+ "debian-2.2" => "debian-2.2",
+ "debian-3.0" => "debian-3.0",
+ "debian-sarge" => "debian-3.0",
+ "ubuntu-5.04" => "debian-3.0",
+ "ubuntu-5.10" => "debian-3.0",
+ "ubuntu-6.04" => "debian-3.0",
+ "suse-7.0" => "suse-7.0",
+ "suse-9.0" => "suse-9.0",
+ "suse-9.1" => "suse-9.0",
+ "turbolinux-7.0" => "redhat-6.2",
+ "pld-1.0" => "pld-1.0",
+ "pld-1.1" => "pld-1.0",
+ "pld-1.99" => "pld-1.0",
+ "fedora-1" => "redhat-7.2",
+ "fedora-2" => "redhat-7.2",
+ "fedora-3" => "redhat-7.2",
+ "fedora-4" => "redhat-7.2",
+ "rpath" => "redhat-7.2",
+ "vine-3.0" => "vine-3.0",
+ "vine-3.1" => "vine-3.0",
+ "ark" => "vine-3.0",
+ "slackware-9.1.0" => "slackware-9.1.0",
+ "slackware-10.0.0" => "slackware-9.1.0",
+ "slackware-10.1.0" => "slackware-9.1.0",
+ "slackware-10.2.0" => "slackware-9.1.0",
+ "gentoo" => "gentoo",
+ "vlos-1.2" => "gentoo",
+ "freebsd-5" => "freebsd-5",
+ "freebsd-6" => "freebsd-5",
+ );
my %dist_tables =
(
Index: platform.pl.in
===================================================================
RCS file: /cvs/system-tools-backends/system-tools-backends/platform.pl.in,v
retrieving revision 1.73
diff -u -3 -p -r1.73 platform.pl.in
--- platform.pl.in 21 Nov 2005 01:27:32 -0000 1.73
+++ platform.pl.in 19 Dec 2005 04:27:49 -0000
@@ -41,7 +41,9 @@ $PLATFORM_INFO = {
"debian-2.2" => "Debian GNU/Linux 2.2 Potato",
"debian-3.0" => "Debian GNU/Linux 3.0 Woody",
"debian-sarge" => "Debian GNU/Linux Sarge",
- "ubuntu-5.04" => "Ubuntu GNU/Linux Hoary",
+ "ubuntu-5.04" => "Kubuntu GNU/Linux Hoary",
+ "ubuntu-5.10" => "Kubuntu GNU/Linux Breezy",
+ "ubuntu-6.04" => "Kubuntu GNU/Linux Dapper",
"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",
@@ -61,6 +63,10 @@ $PLATFORM_INFO = {
"mandrake-9.2" => "Linux Mandrake 9.2 FiveStar",
"mandrake-10.0" => "Linux Mandrake 10.0",
"mandrake-10.1" => "Linux Mandrake 10.1",
+ "mandrake-10.2" => "Linux Mandrake 2005 LE",
+ "mandriva-2006.0" => "Mandriva Linux 2006.0",
+ "mandriva-2006.1" => "Mandriva Linux 2006.1",
+ "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",
@@ -89,7 +95,9 @@ $PLATFORM_INFO = {
"fedora-1" => "Fedora Core 1 (Yarrow)",
"fedora-2" => "Fedora Core 2 (Tettnang)",
"fedora-3" => "Fedora Core 3 (Heidelberg)",
+ "fedora-4" => "Fedora Core 4 (Stentz)",
"rpath" => "rPath Linux",
+ "ark" => "Arkark Linux",
};
sub check_lsb
@@ -219,6 +227,55 @@ sub check_mandrake
return -1;
}
+sub check_mandriva
+{
+ open MANDRIVA, "$gst_prefix/etc/mandriva-release" or return -1;
+ while (<MANDRIVA>)
+ {
+ $ver = $_;
+ chomp ($ver);
+ if ($ver =~ /^Linux Mandriva release (\S+)/)
+ {
+ close MANDRIVA;
+ return "mandriva-$1";
+ }
+ elsif ($ver =~ /^Mandriva( L|l)inux release ([\d\.]+)/i)
+ {
+ close MANDRIVA;
+ return "mandriva-$2";
+ }
+ }
+ close MANDRIVA;
+ 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;
@@ -425,6 +482,25 @@ sub check_vine
return -1;
}
+sub check_ark
+{
+ open ARK, "$gst_prefix/etc/ark-release" or return -1;
+ while (<ARK>)
+ {
+ $ver = $_;
+ chomp ($ver);
+
+ if ($ver =~ /^Ark Linux/)
+ {
+ close ARK;
+ return "ark";
+ }
+ }
+
+ close ARK;
+ return -1;
+}
+
sub check_freebsd
{
my ($sysctl_cmd, @output);
@@ -482,9 +558,9 @@ 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_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna,
- \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux ],
+ "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_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ],
"FreeBSD" => [ \&check_freebsd ],
"SunOS" => [ \&check_solaris ]
);
Index: service.pl.in
===================================================================
RCS file: /cvs/system-tools-backends/system-tools-backends/service.pl.in,v
retrieving revision 1.91
diff -u -3 -p -r1.91 service.pl.in
--- service.pl.in 21 Nov 2005 01:27:32 -0000 1.91
+++ service.pl.in 19 Dec 2005 04:27:49 -0000
@@ -67,6 +67,11 @@ sub gst_service_sysv_get_paths
"mandrake-9.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"mandrake-10.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"mandrake-10.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "mandrake-10.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "mandriva-2006.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "mandriva-2006.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+
+ "yoper-2.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"blackpanther-4.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -77,6 +82,7 @@ sub gst_service_sysv_get_paths
"debian-3.0" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
"debian-sarge" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
"ubuntu-5.04" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+ "ubuntu-6.04" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
"suse-7.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d", "../"],
"suse-9.0" => ["$gst_prefix/etc/init.d", "$gst_prefix/etc/init.d", "../"],
@@ -91,11 +97,14 @@ sub gst_service_sysv_get_paths
"fedora-1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"fedora-2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"fedora-3" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "fedora-4" => ["$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"],
"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"],
);
my $res;
@@ -129,6 +138,11 @@ sub gst_service_sysv_get_runlevels
"mandrake-9.2" => [3, 5],
"mandrake-10.0" => [3, 5],
"mandrake-10.1" => [3, 5],
+ "mandrake-10.2" => [3, 5],
+ "mandriva-2006.0" => [3, 5],
+ "mandriva-2006.1" => [3, 5],
+
+ "yoper-2.2" => [3, 5],
"blackpanther-4.0" => [3, 5],
@@ -139,6 +153,7 @@ sub gst_service_sysv_get_runlevels
"debian-3.0" => [2, 3],
"debian-sarge" => [2, 3],
"ubuntu-5.04" => [2, 3],
+ "ubuntu-6.04" => [2, 3],
"suse-7.0" => [3, 5],
"suse-9.0" => [3, 5],
@@ -153,11 +168,14 @@ sub gst_service_sysv_get_runlevels
"fedora-1" => [3, 5],
"fedora-2" => [3, 5],
"fedora-3" => [3, 5],
+ "fedora-4" => [3, 5],
"rpath" => [3, 5],
"vine-3.0" => [3, 5],
"vine-3.1" => [3, 5],
+
+ "ark" => [3, 5],
);
my $res;
@@ -190,7 +208,12 @@ sub gst_service_get_runlevel_roles
"mandrake-9.2" => "redhat-5.2",
"mandrake-10.0" => "redhat-5.2",
"mandrake-10.1" => "redhat-5.2",
-
+ "mandrake-10.2" => "redhat-5.2",
+ "mandriva-2006.0" => "redhat-5.2",
+ "mandriva-2006.1" => "redhat-5.2",
+
+ "yoper-2.2" => "redhat-5.2",
+
"blackpanther-4.0" => "redhat-5.2",
"conectiva-9" => "redhat-5.2",
@@ -200,6 +223,7 @@ sub gst_service_get_runlevel_roles
"debian-3.0" => "debian-2.2",
"debian-sarge" => "debian-2.2",
"ubuntu-5.04" => "debian-2.2",
+ "ubuntu-6.04" => "debian-2.2",
"suse-7.0" => "redhat-5.2",
"suse-9.0" => "redhat-5.2",
@@ -212,12 +236,15 @@ sub gst_service_get_runlevel_roles
"fedora-1" => "redhat-5.2",
"fedora-2" => "redhat-5.2",
"fedora-3" => "redhat-5.2",
+ "fedora-4" => "redhat-5.2",
"rpath" => "redhat-5.2",
"vine-3.0" => "redhat-5.2",
"vine-3.1" => "redhat-5.2",
+ "ark" => "redhat-5.2",
+
"slackware-9.1.0" => "slackware-9.1.0",
"slackware-10.0.0" => "slackware-9.1.0",
"slackware-10.1.0" => "slackware-9.1.0",
@@ -1547,6 +1574,7 @@ sub gst_service_get_status
"debian-3.0" => \&gst_service_debian_get_status,
"debian-sarge" => \&gst_service_debian_get_status,
"ubuntu-5.04" => \&gst_service_debian_get_status,
+ "ubuntu-6.04" => \&gst_service_debian_get_status,
"redhat-5.2" => \&gst_service_redhat_get_status,
"redhat-6.0" => \&gst_service_redhat_get_status,
@@ -1562,6 +1590,8 @@ sub gst_service_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,
+
"rpath" => \&gst_service_redhat_get_status,
"suse-9.0" => \&gst_service_suse_get_status,
Attachment:
Ybutton.gif
Description: GIF image
