diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-21 00:16:04 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-21 00:16:04 +0000 |
commit | 7e8fa9773839843c9d8def81ec2ef1315115825a (patch) | |
tree | b20f63ae9f67b2d9c7e8aa6a2b86d56e0d953743 /perl-install/printer/printerdrake.pm | |
parent | 54b71cdf438434e4693aa6064596f4fdb4aac59e (diff) | |
download | drakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.tar drakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.tar.gz drakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.tar.bz2 drakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.tar.xz drakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.zip |
- %modules::conf is no more a global, so many functions need passing $modules_conf
- $modules_conf is a class choosing modules.conf or modprobe.conf
(esp. useful after install) (but not working yet!)
- modules::load() doesn't use $modules_conf, use modules::load_and_configure()
- modules::load() doesn't allow options, use either modules::load_raw() or modules::load_and_configure()
- some functions used to want an array ref for modules options and some a string, now every functions use a string
- many functions (like modules::get_alias()) are now methods on $modules_conf
- some functions in mouse.pm needed a $in where a $do_pkgs is enough
- some perl_checker compliance
- small fixes
Diffstat (limited to 'perl-install/printer/printerdrake.pm')
-rw-r--r-- | perl-install/printer/printerdrake.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 0eb075250..16ce47230 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -3513,11 +3513,12 @@ sub check_network { N("Go on without configuring the network") ] } ])) { if ($choice eq N("Configure the network now")) { if ($::isInstall) { + my $o = $in; require network::netconnect; network::netconnect::main( - $in->{prefix}, $in->{netcnx} ||= {}, - $in, $in->{netc}, $in->{mouse}, - $in->{intf}); + $o->{prefix}, $o->{netcnx} ||= {}, + $in, $o->{modules_conf}, $o->{netc}, $o->{mouse}, + $o->{intf}); # my ($prefix, $netcnx, $in, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) = @_; } else { system("/usr/sbin/drakconnect"); |