summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-10 12:03:19 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-10 12:03:19 +0000
commita89bc52b870b86d78ed7e1079e1b81ec4de6a3d7 (patch)
treec18d17e9cf2b41134563440630a44c5645061ea5
parent7cb5d26da559b5d00af69e029bceca11932d1ec1 (diff)
downloaddrakx-backup-do-not-use-a89bc52b870b86d78ed7e1079e1b81ec4de6a3d7.tar
drakx-backup-do-not-use-a89bc52b870b86d78ed7e1079e1b81ec4de6a3d7.tar.gz
drakx-backup-do-not-use-a89bc52b870b86d78ed7e1079e1b81ec4de6a3d7.tar.bz2
drakx-backup-do-not-use-a89bc52b870b86d78ed7e1079e1b81ec4de6a3d7.tar.xz
drakx-backup-do-not-use-a89bc52b870b86d78ed7e1079e1b81ec4de6a3d7.zip
network::tools::connect_prog shouldn't be used/written anymore now
-rw-r--r--perl-install/network/netconnect.pm41
1 files changed, 0 insertions, 41 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 2e44ef2e4..eb5356f6b 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -1294,47 +1294,6 @@ Click on Ok to keep your configuration, or cancel to reconfigure your Internet &
# install needed packages:
$network_configured or network::network::configureNetwork2($in, $::prefix, $netc, $intf);
- my $connect_cmd;
- if ($netcnx->{type} =~ /modem/ || $netcnx->{type} =~ /isdn_external/) {
- $connect_cmd = qq(
-#!/bin/bash
-if [ -n "\$DISPLAY" ]; then
- if [ -e /usr/bin/kppp ]; then
- /sbin/route del default
- /usr/bin/kppp &
- else
- /usr/sbin/net_monitor --connect
- fi
- else
- $network::tools::connect_file
-fi
-);
- } elsif ($netcnx->{type}) {
- $connect_cmd = qq(
-#!/bin/bash
-if [ -n "\$DISPLAY" ]; then
- /usr/sbin/net_monitor --connect
-else
- $network::tools::connect_file
-fi
-);
- } else {
- $connect_cmd = qq(
-#!/bin/bash
-/usr/sbin/drakconnect
-);
- }
- if ($direct_net_install) {
- $connect_cmd = qq(
-#!/bin/bash
-if [ -n "\$DISPLAY" ]; then
- /usr/sbin/net_monitor --connect
-else
- $network::tools::connect_file
-fi
-);
- }
- output_with_perm("$::prefix$network::tools::connect_prog", 0755, $connect_cmd) if $connect_cmd;
$netcnx->{$_} = $netc->{$_} foreach qw(NET_DEVICE NET_INTERFACE);
$netcnx->{type} =~ /adsl/ or run_program::rooted($::prefix, "/chkconfig --del adsl 2> /dev/null");