← Back to branch summary

~ubuntu-branches/ubuntu/karmic/system-tools-backends/karmic-proposed

« back to all changes in this revision

Viewing changes to Network/Ifaces.pm

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2009-10-08 11:42:26 UTC
  • mfrom: (1.1.28 upstream) (1.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20091008114226-zp9fxn7h4ky0qai0
Tags: 2.8.2-1
* New upstream release.
  - debian/patches/01_debian_4.0.patch,
  - debian/patches/04_correct_perl_command.patch:
    + Removed, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Network/Ifaces.pm
126
126
  my ($fd, $line);
127
127
  my (@ifaces, $command);
128
128
 
129
 
  $command = &Utils::File::get_cmd_path ("iwconfig");
130
 
  open $fd, "$command |";
 
129
  $fd = &Utils::File::run_pipe_read ("iwconfig");
131
130
  return @ifaces if $fd eq undef;
132
131
 
133
132
  while (<$fd>)
1984
1983
{
1985
1984
  my %dist_map =
1986
1985
         (
 
1986
    "debian"          => "debian",
1987
1987
    "redhat-6.2"      => "redhat-6.2",
1988
1988
    "redhat-7.0"      => "redhat-6.2",
1989
1989
    "redhat-7.1"      => "redhat-6.2",
1992
1992
    "mandrake-9.0"    => "mandrake-9.0",
1993
1993
    "yoper-2.2"       => "redhat-6.2",
1994
1994
    "conectiva-9"     => "conectiva-9",
1995
 
    "debian-3.0"      => "debian-3.0",
1996
 
    "ubuntu-7.04"     => "debian-3.0",
1997
1995
    "suse-9.0"        => "suse-9.0",
1998
1996
    "pld-1.0"         => "pld-1.0",
1999
1997
    "vine-3.0"        => "vine-3.0",
2394
2392
       ]
2395
2393
     },
2396
2394
 
2397
 
     "debian-3.0" =>
 
2395
     "debian" =>
2398
2396
     {
2399
2397
       fn =>
2400
2398
       {
3118
3116
     ]
3119
3117
   },
3120
3118
 
3121
 
   "debian-3.0" =>
 
3119
   "debian" =>
3122
3120
   {
3123
3121
     iface_set    => \&activate_interface,
3124
3122
     iface_delete => \&delete_debian_interface,
3662
3660
{
3663
3661
  my $dist = $Utils::Backend::tool{"platform"};
3664
3662
  my $default = [ "static", "dhcp" ];
3665
 
  my %dist_map = (
3666
 
    "ubuntu-7.04"  => [ "ipv4ll" ],
3667
 
  );
 
3663
  my %dist_map = ();
3668
3664
 
3669
3665
  push @$default, @{$dist_map{$dist}};
3670
3666
  return $default;
3675
3671
  my $dist = $Utils::Backend::tool{"platform"};
3676
3672
  my $default = [ "wep-hex", "wep-ascii" ];
3677
3673
  my %dist_map = (
3678
 
    "debian-3.0"  => [ "wpa-psk", "wpa2-psk" ],
3679
 
    "ubuntu-7.04" => [ "wpa-psk", "wpa2-psk" ],
 
3674
    "debian"  => [ "wpa-psk", "wpa2-psk" ],
3680
3675
  );
3681
3676
 
3682
3677
  push @$default, @{$dist_map{$dist}};