summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Init/Services.pm6
-rw-r--r--Network/Hosts.pm6
-rw-r--r--Network/Ifaces.pm14
-rw-r--r--Shares/SMB.pm27
-rw-r--r--Time/NTP.pm3
-rw-r--r--Time/TimeDate.pm38
-rw-r--r--Users/Users.pm2
-rw-r--r--Utils/Platform.pm20
8 files changed, 29 insertions, 87 deletions
diff --git a/Init/Services.pm b/Init/Services.pm
index ce5dbac..83ba38c 100644
--- a/Init/Services.pm
+++ b/Init/Services.pm
@@ -45,8 +45,7 @@ sub get_runlevels
"redhat-8.0" => "redhat-6.2",
"mandrake-9.0" => "redhat-6.2",
"conectiva-9" => "redhat-6.2",
- "debian-3.0" => "redhat-6.2",
- "ubuntu-7.04" => "redhat-6.2",
+ "debian" => "redhat-6.2",
"suse-9.0" => "redhat-6.2",
"pld-1.0" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
@@ -102,8 +101,7 @@ sub get_sysv_paths
"mandrake-9.0" => ["$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"],
"conectiva-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "debian-3.0" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
- "ubuntu-7.04" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+ "debian" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
"suse-9.0" => ["$gst_prefix/etc/init.d", "$gst_prefix/etc/init.d", "../"],
"pld-1.0" => ["$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"],
diff --git a/Network/Hosts.pm b/Network/Hosts.pm
index 94ffdb5..c01867a 100644
--- a/Network/Hosts.pm
+++ b/Network/Hosts.pm
@@ -45,8 +45,6 @@ sub get_fqdn_dist
"mandrake-9.0" => "redhat-6.2",
"yoper-2.2" => "redhat-6.2",
"conectiva-9" => "redhat-6.2",
- "debian-3.0" => "debian-2.2",
- "ubuntu-7.04" => "debian-2.2",
"suse-9.0" => "suse-9.0",
"pld-1.0" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
@@ -95,7 +93,7 @@ sub get_fqdn_parse_table
]
},
- "debian-2.2" =>
+ "debian" =>
{
fn =>
{
@@ -215,7 +213,7 @@ sub get_fqdn_replace_table
]
},
- "debian-2.2" =>
+ "debian" =>
{
fn =>
{
diff --git a/Network/Ifaces.pm b/Network/Ifaces.pm
index a105c78..b906ef3 100644
--- a/Network/Ifaces.pm
+++ b/Network/Ifaces.pm
@@ -1983,6 +1983,7 @@ sub get_interface_dist
{
my %dist_map =
(
+ "debian" => "debian",
"redhat-6.2" => "redhat-6.2",
"redhat-7.0" => "redhat-6.2",
"redhat-7.1" => "redhat-6.2",
@@ -1991,8 +1992,6 @@ sub get_interface_dist
"mandrake-9.0" => "mandrake-9.0",
"yoper-2.2" => "redhat-6.2",
"conectiva-9" => "conectiva-9",
- "debian-3.0" => "debian-3.0",
- "ubuntu-7.04" => "debian-3.0",
"suse-9.0" => "suse-9.0",
"pld-1.0" => "pld-1.0",
"vine-3.0" => "vine-3.0",
@@ -2393,7 +2392,7 @@ sub get_interface_parse_table
]
},
- "debian-3.0" =>
+ "debian" =>
{
fn =>
{
@@ -3117,7 +3116,7 @@ sub get_interface_replace_table
]
},
- "debian-3.0" =>
+ "debian" =>
{
iface_set => \&activate_interface,
iface_delete => \&delete_debian_interface,
@@ -3661,9 +3660,7 @@ sub get_available_configuration_methods
{
my $dist = $Utils::Backend::tool{"platform"};
my $default = [ "static", "dhcp" ];
- my %dist_map = (
- "ubuntu-7.04" => [ "ipv4ll" ],
- );
+ my %dist_map = ();
push @$default, @{$dist_map{$dist}};
return $default;
@@ -3674,8 +3671,7 @@ sub get_available_encryptions
my $dist = $Utils::Backend::tool{"platform"};
my $default = [ "wep-hex", "wep-ascii" ];
my %dist_map = (
- "debian-3.0" => [ "wpa-psk", "wpa2-psk" ],
- "ubuntu-7.04" => [ "wpa-psk", "wpa2-psk" ],
+ "debian" => [ "wpa-psk", "wpa2-psk" ],
);
push @$default, @{$dist_map{$dist}};
diff --git a/Shares/SMB.pm b/Shares/SMB.pm
index ae740a7..93b6844 100644
--- a/Shares/SMB.pm
+++ b/Shares/SMB.pm
@@ -129,28 +129,27 @@ sub get_distro_smb_file
my %dist_map =
(
+ "debian" => "debian",
"redhat-6.2" => "redhat-6.2",
- "redhat-7.0" => "debian-3.0",
- "redhat-7.1" => "debian-3.0",
- "redhat-7.2" => "debian-3.0",
- "redhat-7.3" => "debian-3.0",
- "redhat-8.0" => "debian-3.0",
- "mandrake-9.0" => "debian-3.0",
- "debian-3.0" => "debian-3.0",
- "ubuntu-7.04" => "debian-3.0",
- "suse-9.0" => "debian-3.0",
- "slackware-9.1.0" => "debian-3.0",
- "gentoo" => "debian-3.0",
- "archlinux" => "debian-3.0",
+ "redhat-7.0" => "debian",
+ "redhat-7.1" => "debian",
+ "redhat-7.2" => "debian",
+ "redhat-7.3" => "debian",
+ "redhat-8.0" => "debian",
+ "mandrake-9.0" => "debian",
+ "suse-9.0" => "debian",
+ "slackware-9.1.0" => "debian",
+ "gentoo" => "debian",
+ "archlinux" => "debian",
"pld-1.0" => "pld-1.0",
- "vine-3.0" => "debian-3.0",
+ "vine-3.0" => "debian",
"freebsd-5" => "freebsd-5",
);
my %dist_tables =
(
"redhat-6.2" => "/etc/smb.conf",
- "debian-3.0" => "/etc/samba/smb.conf",
+ "debian" => "/etc/samba/smb.conf",
"pld-1.0" => "/etc/smb/smb.conf",
"freebsd-5" => "/usr/local/etc/smb.conf",
);
diff --git a/Time/NTP.pm b/Time/NTP.pm
index 39f7331..e7be3a9 100644
--- a/Time/NTP.pm
+++ b/Time/NTP.pm
@@ -34,8 +34,7 @@ sub get_config_file ()
"redhat-7.3" => "redhat-6.2",
"redhat-8.0" => "redhat-6.2",
"mandrake-9.0" => "redhat-6.2",
- "debian-3.0" => "redhat-6.2",
- "ubuntu-7.04" => "redhat-6.2",
+ "debian" => "redhat-6.2",
"suse-9.0" => "redhat-6.2",
"slackware-9.1.0" => "redhat-6.2",
"gentoo" => "redhat-6.2",
diff --git a/Time/TimeDate.pm b/Time/TimeDate.pm
index bf5ab45..f5c3757 100644
--- a/Time/TimeDate.pm
+++ b/Time/TimeDate.pm
@@ -158,6 +158,7 @@ sub get_dist
{
my %dist_map =
(
+ "debian" => "debian",
"redhat-6.2" => "redhat-6.2",
"redhat-7.0" => "redhat-6.2",
"redhat-7.1" => "redhat-6.2",
@@ -165,9 +166,6 @@ sub get_dist
"redhat-7.3" => "redhat-6.2",
"redhat-8.0" => "redhat-6.2",
"mandrake-9.0" => "redhat-6.2",
- "debian-4.0" => "debian-4.0",
- "debian-testing" => "debian-4.0",
- "ubuntu-7.04" => "debian-4.0",
"suse-9.0" => "redhat-6.2",
"slackware-9.1.0" => "redhat-6.2",
"gentoo" => "redhat-6.2",
@@ -199,21 +197,7 @@ sub conf_get_parse_table
]
},
- "debian-3.0" =>
- {
- fn =>
- {
- ZONEINFO => "/usr/share/zoneinfo",
- LOCAL_TIME => "/etc/localtime"
- },
- table =>
- [
- [ "local_time", \&get_utc_time ],
- [ "timezone", \&get_timezone, [LOCAL_TIME, ZONEINFO] ],
- ]
- },
-
- "debian-4.0" =>
+ "debian" =>
{
fn =>
{
@@ -281,23 +265,7 @@ sub conf_get_replace_table
]
},
- "debian-3.0" =>
- {
- fn =>
- {
- ZONEINFO => "/usr/share/zoneinfo",
- LOCAL_TIME => "/etc/localtime",
- TIMEZONE => "/etc/timezone"
- },
- table =>
- [
- [ "timezone", \&set_timezone, [LOCAL_TIME, ZONEINFO] ],
- [ "timezone", \&Utils::Replace::set_first_line, TIMEZONE ],
- [ "local_time", \&set_utc_time ],
- ]
- },
-
- "debian-4.0" =>
+ "debian" =>
{
fn =>
{
diff --git a/Users/Users.pm b/Users/Users.pm
index bfc6d96..2ec852d 100644
--- a/Users/Users.pm
+++ b/Users/Users.pm
@@ -236,7 +236,7 @@ my $logindefs_dist_map = {
'mandrake-9.0' => $rh_logindefs_defaults,
'pld-1.0' => $rh_logindefs_defaults,
'fedora-1' => $rh_logindefs_defaults,
- 'debian-3.0' => $rh_logindefs_defaults,
+ 'debian' => $rh_logindefs_defaults,
'vine-3.0' => $rh_logindefs_defaults,
'gentoo' => $gentoo_logindefs_defaults,
'archlinux' => $gentoo_logindefs_defaults,
diff --git a/Utils/Platform.pm b/Utils/Platform.pm
index f582dce..6494fe7 100644
--- a/Utils/Platform.pm
+++ b/Utils/Platform.pm
@@ -32,15 +32,7 @@ use Utils::Replace;
# --- System guessing --- #
my $PLATFORM_INFO = {
- "debian-3.0" => [ "Debian GNU/Linux", "3.0", "Woody" ],
- "debian-3.1" => [ "Debian GNU/Linux", "3.1", "Sarge" ],
- "ubuntu-5.04" => [ "Ubuntu Linux", "5.04", "Hoary" ],
- "ubuntu-5.10" => [ "Ubuntu Linux", "5.10", "Breezy" ],
- "ubuntu-6.06" => [ "Ubuntu Linux", "6.06", "Dapper" ],
- "ubuntu-6.10" => [ "Ubuntu Linux", "6.10", "Edgy" ],
- "ubuntu-7.04" => [ "Ubuntu Linux", "7.04", "Feisty" ],
- "ubuntu-7.10" => [ "Ubuntu Linux", "7.10", "Gutsy" ],
- "ubuntu-8.04" => [ "Ubuntu Linux", "8.04", "Hardy" ],
+ "debian" => [ "Debian GNU/Linux" ],
"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" ],
@@ -116,7 +108,6 @@ sub ensure_distro_map
(
"blackpanther-4.0" => "mandrake-9.0",
"conectiva-10" => "conectiva-9",
- "debian-3.1" => "debian-3.0",
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
"mandrake-9.1" => "mandrake-9.0",
@@ -147,16 +138,9 @@ sub ensure_distro_map
"slackware-12.0.0" => "slackware-9.1.0",
"bluewhite64-12.0.0" => "slackware-9.1.0",
"suse-9.1" => "suse-9.0",
- "ubuntu-5.04" => "debian-3.0",
- "ubuntu-5.10" => "debian-3.0",
- "ubuntu-6.06" => "debian-3.0",
- "ubuntu-6.10" => "debian-3.0",
- "ubuntu-7.10" => "ubuntu-7.04",
- "ubuntu-8.04" => "ubuntu-7.04",
"vine-3.1" => "vine-3.0",
"vlos-1.2" => "gentoo",
"nexenta-1.0" => "solaris-2.11",
- "guadalinex-v4" => "debian-3.0",
);
return $metamap{$distro} if ($metamap{$distro});
@@ -366,7 +350,7 @@ sub guess
my %platform_checks = (
"Linux" => [[ \&check_lsb ],
- [ \&check_distro_file, "/etc/debian_version", "debian", "(.*)", { "testing/unstable" => "sarge" } ],
+ [ \&check_file_exists, "/etc/debian_version", "debian" ],
[ \&check_distro_file, "/etc/SuSE-release", "suse", "VERSION\\s*=\\s*(\\S+)" ],
[ \&check_distro_file, "/etc/blackPanther-release", "blackpanther", "^Linux Black Panther release (\\S+)" ],
[ \&check_distro_file, "/etc/blackPanther-release", "blackpanther", "^Black Panther ( L|l)inux release ([\\d\\.]+)" ],
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 19:52:11 +0000