diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-01-07 11:56:31 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-01-07 11:56:31 +0000 |
| commit | 4b1e5a783ad0ceab4640d3e0359ed253439b5d3c (patch) | |
| tree | d8085bd24171b42b06207f8c64ae8948e6e21d69 | |
| parent | e28cc9776192f3d4bbc86bd2781106faf6d0b656 (diff) | |
| download | drakx-4b1e5a783ad0ceab4640d3e0359ed253439b5d3c.tar drakx-4b1e5a783ad0ceab4640d3e0359ed253439b5d3c.tar.gz drakx-4b1e5a783ad0ceab4640d3e0359ed253439b5d3c.tar.bz2 drakx-4b1e5a783ad0ceab4640d3e0359ed253439b5d3c.tar.xz drakx-4b1e5a783ad0ceab4640d3e0359ed253439b5d3c.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 | ||||
| -rw-r--r-- | perl-install/printerdrake.pm | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index be7c75257..18e5a5bcd 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -609,6 +609,8 @@ sub main { modules::read_stage1_conf("/tmp/conf.modules"); modules::read_already_loaded(); + install_any::lnx4win_preinstall() if $o->{lnx4win}; + #-the main cycle my $clicked = 0; MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) { diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 8c41424cb..8e029aa65 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -333,6 +333,10 @@ sub crypt($) { crypt ($password, salt(2)); } +sub lnx4win_preinstall { + require swap; + swap::swapon("/dos/lnx4win/swapfile"); #- allow lnx4win to run with a little more memory. +} sub lnx4win_postinstall { my ($prefix) = @_; my $dir = "/dos/lnx4win"; diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index a5e1b4a8b..397f9adbd 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -199,9 +199,7 @@ wish to access and any applicable user name and password."), $printer->{RESOLUTION} = "Default" unless @list_res; $printer->{CRLF} = $db_entry{DESCR} =~ /HP/; - $printer->{BITSPERPIXEL} = "Default" unless @list_col; - - $printer->{BITSPERPIXEL} = $depth_to_col{$printer->{BITSPERPIXEL}} || $printer->{BITSPERPIXEL}; #- translate. + $printer->{BITSPERPIXEL} = @list_col ? $depth_to_col{$printer->{BITSPERPIXEL}} || $depth_to_col{$col[0]} : "Default"; $in->ask_from_entries_refH('', _("Printer options"), [ _("Paper Size") => { val => \$printer->{PAPERSIZE}, type => 'list', , not_edit => !$::expert, list => \@printer::papersize_type }, @@ -215,7 +213,7 @@ _("Uniprint driver options") => { val => \$printer->{BITSPERPIXEL}, type => 'lis _("Color depth options") => { val => \$printer->{BITSPERPIXEL}, type => 'list', , not_edit => !$::expert, list => \@col } ), ) : () ]);; - $printer->{BITSPERPIXEL} = $col_to_depth{$printer->{BITSPERPIXEL}} || $printer->{BITSPERPIXEL}; #- translate. + $printer->{BITSPERPIXEL} = $col_to_depth{$printer->{BITSPERPIXEL}} || $printer->{BITSPERPIXEL}; #- translate back. $printer->{complete} = 1; copy_printer_params($printer, $printer->{configured}{$printer->{QUEUE}} ||= {}); |