summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2004-02-03 16:35:16 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2004-02-03 16:35:16 +0000
commit78551c18c6dd15f7ca6be86c861e9d8fda087131 (patch)
tree1fb0069b3a2c4b00856f32be1c456eccaafde737
parente74244b3f91b47801b8fc04ddf1114cd75e1763c (diff)
downloaddrakx-78551c18c6dd15f7ca6be86c861e9d8fda087131.tar
drakx-78551c18c6dd15f7ca6be86c861e9d8fda087131.tar.gz
drakx-78551c18c6dd15f7ca6be86c861e9d8fda087131.tar.bz2
drakx-78551c18c6dd15f7ca6be86c861e9d8fda087131.tar.xz
drakx-78551c18c6dd15f7ca6be86c861e9d8fda087131.zip
- fix adsl_conf_backend call
- store and retreive network interfaces via $config file
-rw-r--r--perl-install/network/netconnect.pm6
-rwxr-xr-xperl-install/standalone/drakconnect5
2 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 393140113..14f5ba463 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -11,6 +11,7 @@ use mouse;
use network::network;
use network::tools;
use MDK::Common::Globals "network", qw($in);
+use Storable qw(store retrieve);
sub detect {
my ($auto_detect, $o_class) = @_;
@@ -89,7 +90,7 @@ sub get_subwizard {
my $ethntf = {};
my $db_path = "/usr/share/apps/kppp/Provider";
my (%countries, @isp, $country, $provider, $old_provider);
-
+ my $config = -f '/etc/sysconfig/drakconnect' ? Storable::retrieve('/etc/sysconfig/drakconnect') : {};
my %wireless_mode = (N("Ad-hoc") => "Ad-hoc",
N("Managed") => "Managed",
@@ -711,6 +712,7 @@ If you don't know, choose 'use pppoe'"),
},
post => sub {
network::adsl::adsl_conf_backend($in, $netcnx, $netc, $ntf_name, $adsl_type); #FIXME
+ $config->{adsl} = { kind => "$ntf_name", protocol => "$adsl_type" };
$handle_multiple_cnx->();
},
},
@@ -1007,7 +1009,7 @@ You may also enter the IP address of the gateway if you have one."),
{
name => N("Configuration is complete, do you want to apply settings ?"),
type => "yesorno",
- next => "network_on_boot",
+ post => sub { Storable::store($config, '/etc/sysconfig/drakconnect'); "network_on_boot" },
},
network_on_boot =>
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 86d0fbe84..686f4c909 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -193,8 +193,7 @@ sub manage {
$notebook->set_property('show-border', 0);
my $apply_button;
- my $config = { 'ethernet0' => { kind => 'eth0' },
- }; # testing
+ my $config = -f '/etc/sysconfig/drakconnect' ? Storable::retrieve('/etc/sysconfig/drakconnect') : {};
#- duplicated from network::ethernet, to be factorized
@all_cards = network::ethernet::get_eth_cards();
@@ -254,7 +253,7 @@ sub build_tree {
if ($interface eq 'adsl') {
$intf->{pages} = { N("TCP/IP") => 1, N("Account") => 1, N("Options") => 1, N("Informations") => 1 };
network::adsl::adsl_probe_info($intf, $netc, $protocol, $interface_kind);
- $intf->{save} = sub { network::adsl::adsl_conf_backend($intf, $netc, $interface_kind, $protocol) };
+ $intf->{save} = sub { network::adsl::adsl_conf_backend($in, $intf, $netc, $interface_kind, $protocol) };
}
elsif ($interface eq 'modem') {
$intf->{pages} = { N("TCP/IP") => 1, N("Account") => 1, N("Options") => 1 };