diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-29 22:43:33 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-29 22:43:33 +0000 |
| commit | 2653652a0e4a6a599815a844903ad0aabe354be6 (patch) | |
| tree | 88bd05fbf84035d77c55918496a343fba0cbc041 /perl-install/network | |
| parent | cc811738967e8413a73da19380af65215822b1e2 (diff) | |
| download | drakx-2653652a0e4a6a599815a844903ad0aabe354be6.tar drakx-2653652a0e4a6a599815a844903ad0aabe354be6.tar.gz drakx-2653652a0e4a6a599815a844903ad0aabe354be6.tar.bz2 drakx-2653652a0e4a6a599815a844903ad0aabe354be6.tar.xz drakx-2653652a0e4a6a599815a844903ad0aabe354be6.zip | |
convert some write_cnx_script() callers into set_cnx_script() ones
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/adsl.pm | 8 | ||||
| -rw-r--r-- | perl-install/network/ethernet.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/isdn.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index d9695f28c..b1c5fe82a 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -218,7 +218,7 @@ user "$adsl->{login}" /usr/bin/killall pppoe pppd\n), }, ); - write_cnx_script($netc, "adsl", join("\n", + set_cnx_script($netc, "adsl", join("\n", "/sbin/route del default", $modems{$adsl_device}{start}, # /usr/sbin/pppd call adsl @@ -230,7 +230,7 @@ user "$adsl->{login}" ); } elsif ($adsl_type eq 'dhcp') { - write_cnx_script($netc, 'adsl', + set_cnx_script($netc, 'adsl', qq( /sbin/route del default #$modems{$adsl_device}{start} @@ -244,7 +244,7 @@ INTERFACE=`$modems{$adsl_device}{get_intf}` $netc->{adsltype}); } elsif ($adsl_type eq 'static') { # TODO: handle manually configured (new feature) - write_cnx_script($netc, 'adsl', + set_cnx_script($netc, 'adsl', qq( /sbin/route del default #$modems{$adsl_device}{start} @@ -269,7 +269,7 @@ INTERFACE=`$modems{$adsl_device}{get_intf}` } "$::prefix/etc/analog/adiusbadsl.conf"; } elsif ($adsl_device eq 'speedtouch') { # speedtouch really is used only with pppoa, let its own script handle firmware upload and the like: - write_cnx_script($netc, 'adsl', + set_cnx_script($netc, 'adsl', qq(/sbin/route del default /usr/share/speedtouch/speedtouch.sh start\n), "/usr/share/speedtouch/speedtouch.sh stop\n", diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 88218e34f..8b74b5bb1 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -24,7 +24,7 @@ sub ether_conf { $netcnx->{type} = 'lan'; $netcnx->{NET_DEVICE} = $netc->{NET_DEVICE} = ''; $netcnx->{NET_INTERFACE} = 'lan'; #$netc->{NET_INTERFACE}; - write_cnx_script($netc, "local network", + set_cnx_script($netc, "local network", qq( /etc/rc.d/init.d/network restart ), diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index 0e77ceea5..153233b58 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -64,7 +64,7 @@ defaultroute write_secret_backend($isdn->{login}, $isdn->{passwd}); - write_cnx_script($netc, "isdn", + set_cnx_script($netc, "isdn", "#/sbin/route del default #/sbin/ifup ippp0 /usr/sbin/isdnctrl dial ippp0 diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 3f0cdc7b8..8b8e478b6 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -451,7 +451,7 @@ Take a look at http://www.linmodems.org"), pre => sub { $mouse ||= {}; $mouse->{device} ||= readlink "$::prefix/dev/mouse"; - write_cnx_script($netc, "modem", join("\n", if_($::testing, "/sbin/route del default"), "ifup ppp0"), + set_cnx_script($netc, "modem", join("\n", if_($::testing, "/sbin/route del default"), "ifup ppp0"), q(ifdown ppp0 killall pppd ), $netcnx->{type}); @@ -853,7 +853,7 @@ notation (for example, 1.2.3.4).")), $ethntf->{MII_NOT_SUPPORTED} = bool2yesno(!$hotplug); $ethntf->{HWADDR} = $track_network_id or delete $ethntf->{HWADDR}; $in->do_pkgs->install($netc->{dhcp_client}) if $auto_ip; - write_cnx_script($netc, "cable", qq( + set_cnx_script($netc, "cable", qq( /sbin/ifup $netc->{NET_DEVICE} ), qq( |