diff options
author | Olivier Blin <oblin@mandriva.org> | 2005-06-03 07:14:48 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.org> | 2005-06-03 07:14:48 +0000 |
commit | 8fc41a1333f01496878ca0561f3ca1ad186b6d64 (patch) | |
tree | 2dd030c580d5b8e954bce95508ac7ecacc6127b9 /perl-install/standalone/drakauth | |
parent | 671adafbfbb78f044970bc4af895ed43dff99757 (diff) | |
download | drakx-8fc41a1333f01496878ca0561f3ca1ad186b6d64.tar drakx-8fc41a1333f01496878ca0561f3ca1ad186b6d64.tar.gz drakx-8fc41a1333f01496878ca0561f3ca1ad186b6d64.tar.bz2 drakx-8fc41a1333f01496878ca0561f3ca1ad186b6d64.tar.xz drakx-8fc41a1333f01496878ca0561f3ca1ad186b6d64.zip |
- merge network settings in a $net hash (it modifies $o fields too):
o $netc becomes $net->{network} and $net->{resolv}
o $intf becomes $net->{ifcfg}
- move zeroconf config stuff in write_zeroconf
- read_tmdns_conf -> read_zeroconf
- read_all_conf -> read_net_conf
- configureNetwork2 -> configure_network
- configure_network: write ifcfg files for ppp interfaces too
- don't install wireless-tools in configure_network, this package is in basesystem
- most functions don't need the file path as an argument in network::network
- drop network::tools::remove_initscript
- don't export too much from network::network
- don't export from network::tools
- remove adsl_unsupported_eci step in drakconnect
- drop passwd2 field in network::adsl
- drop $net->{isdn_internal}
- network::netconnect : main -> safe_main
- use network::netconnect::real_main during install
- don't read network config in network::netconnect::real_main
- install_steps::upNetwork : resolv.conf is already symlinked by network::network::configure_network when appropriate
- try to fix install_any::generate_automatic_stage1_params to use a real interface configuration
- put authentication stuff in $net->{auth}
- drop network::ethernet::write_ether_conf
- drop network::adsl::get_wizard
- use 'static' instead of 'manual' as ADSL method
- drop first_modem and its workarounds in network::modem
- drop deprecated "multiple_internet_cnx" step in drakconnect
- don't save /etc/sysconfig/drakconnect anymore
- drop MDK::Common::Globals stuff
- drop getIP in net_applet (Pixel)
- drop $netc->{DHCP}
- configure_network(): write resolv.conf even if a dhcp interface is configured
Diffstat (limited to 'perl-install/standalone/drakauth')
-rwxr-xr-x | perl-install/standalone/drakauth | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/standalone/drakauth b/perl-install/standalone/drakauth index d29f250ca..db7418d51 100755 --- a/perl-install/standalone/drakauth +++ b/perl-install/standalone/drakauth @@ -9,7 +9,8 @@ use interactive; use authentication; use network::network; -read_all_conf('', my $netc = {}, my $_intf = {}); +my $net = {}; +network::network::read_net_conf($net); my $in = 'interactive'->vnew('su'); @@ -25,11 +26,11 @@ $in->ask_from(N("Authentication"), authentication::kind2description(@kinds), { label => N("Authentication"), val => \$kind, type => 'list' , list => \@kinds, format => \&authentication::kind2name }, ]) or $in->exit; -authentication::ask_parameters($in, $netc, $authentication, $kind) or goto main; +authentication::ask_parameters($in, $net, $authentication, $kind) or goto main; eval { - authentication::set($in, $netc, $authentication); - network::network::write_conf($netc); + authentication::set($in, $net, $authentication); + network::network::write_conf($net); }; if (my $err = $@) { $in->ask_warn(N("Error"), formatError($err)); |