[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdeadmin/knetworkconf/backends
From: Laurent Montel <montel () kde ! org>
Date: 2005-11-21 9:44:11
Message-ID: 1132566251.788880.15793.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 481972 by mlaurent:
Add support for mandrake-10.2 and mandriva-2006
M +1 -1 network-conf.in
M +14 -0 network.pl.in
M +26 -2 platform.pl.in
M +7 -1 service.pl.in
--- branches/KDE/3.5/kdeadmin/knetworkconf/backends/network-conf.in #481971:481972
@@ -65,7 +65,7 @@
"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",
"blackpanther-4.0",
"debian-2.2", "debian-3.0", "debian-sarge",
"ubuntu-5.04", "ubuntu-5.10",
--- branches/KDE/3.5/kdeadmin/knetworkconf/backends/network.pl.in #481971:481972
@@ -501,6 +501,8 @@
"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",
"blackpanther-4.0" => "debian-2.2",
"suse-7.0" => "debian-2.2",
"suse-9.0" => "redhat-6.2",
@@ -1781,6 +1783,8 @@
"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,
"blackpanther-4.0" => \&gst_network_rh62_get_file,
"conectiva-9" => \&gst_network_rh62_get_file,
"conectiva-10" => \&gst_network_rh62_get_file,
@@ -3887,6 +3891,8 @@
"mandrake-9.2" => "lo",
"mandrake-10.0" => "lo",
"mandrake-10.1" => "lo",
+ "mandrake-10.2" => "lo",
+ "mandriva-2006.0" => "lo",
"blackpanther-4.0" => "lo",
"conectiva-9" => "lo",
"conectiva-10" => "lo",
@@ -4019,6 +4025,8 @@
"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",
"blackpanther-4.0" => "redhat-7.0",
"conectiva-9" => "redhat-7.0",
"conectiva-10" => "redhat-7.0",
@@ -4502,6 +4510,8 @@
"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",
"blackpanther-4.0" => "mandrake-9.0",
"conectiva-9" => "conectiva-9",
"conectiva-10" => "conectiva-9",
@@ -5380,6 +5390,8 @@
"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",
"blackpanther-4.0" => "redhat-7.0",
"conectiva-9" => "redhat-7.0",
"conectiva-10" => "redhat-7.0",
@@ -5813,6 +5825,8 @@
"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",
"blackpanther-4.0" => "mandrake-9.0",
"conectiva-9" => "conectiva-9",
"conectiva-10" => "conectiva-9",
--- branches/KDE/3.5/kdeadmin/knetworkconf/backends/platform.pl.in #481971:481972
@@ -61,7 +61,9 @@
"mandrake-9.1" => "Linux Mandrake 9.1 Bamboo",
"mandrake-9.2" => "Linux Mandrake 9.2 FiveStar",
"mandrake-10.0" => "Linux Mandrake 10.0",
- "mandrake-10.1" => "Linux Mandrake 10.1",
+ "mandrake-10.1" => "Mandrake 10.1",
+ "mandrake-10.2" => "Mandrake Linux Limited Edition 2005",
+ "mandriva-2006.0" => "Mandriva Linux 2006.0",
"blackpanther-4.0" => "Black Panther OS 4.0",
"conectiva-9" => "Conectiva Linux 9",
"conectiva-10" => "Conectiva Linux 10",
@@ -200,6 +202,28 @@
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_mandrake
{
open MANDRAKE, "$gst_prefix/etc/mandrake-release" or return -1;
@@ -519,7 +543,7 @@
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_yoper, \&check_mandrake, \&check_conectiva, \
\&check_linuxppc, \&check_redhat, \&check_openna, + \&check_fedora, \
\&check_yoper, \&check_mandrake, \&check_mandriva, \&check_conectiva, \
\&check_linuxppc, \&check_redhat, \&check_openna,
\&check_turbolinux, \&check_slackware, \&check_vlos, \
\&check_gentoo, \&check_pld, \&check_specifix, \&check_archlinux, \&check_ark ], \
"FreeBSD" => [ \&check_freebsd ], "SunOS" => [ \&check_solaris ]
--- branches/KDE/3.5/kdeadmin/knetworkconf/backends/service.pl.in #481971:481972
@@ -67,7 +67,9 @@
"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"], +
"blackpanther-4.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", \
"../init.d"],
"conectiva-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", \
"../init.d"], @@ -134,6 +136,8 @@
"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],
"blackpanther-4.0" => [3, 5],
@@ -201,6 +205,8 @@
"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",
"blackpanther-4.0" => "redhat-5.2",
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic