summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-22 01:56:47 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-22 01:56:47 +0000
commit3fbb4389df3ddeecd4fcd645591a3d90a47de373 (patch)
tree8f1547576b7dcbb2678e5aac7516d3e22e5169ec /perl-install/install_steps_interactive.pm
parentc942786c119d41faaa03357ddeb5bea338867727 (diff)
downloaddrakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar.gz
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar.bz2
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar.xz
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index f6b5a9f9e..55c11b2f3 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -145,6 +145,8 @@ sub selectMouse {
_("Which serial port is your mouse connected to?"),
[ mouse::serial_ports_names() ])) if $o->{mouse}{device} eq "ttyS";
+ $o->setup_thiskind('serial_usb', !$::expert, 0) if $o->{mouse}{device} eq "usbmouse";
+
$o->SUPER::selectMouse;
}
#------------------------------------------------------------------------------
@@ -263,6 +265,12 @@ sub installPackages {
$o->SUPER::installPackages($packages);
}
+sub afterInstallPackages($) {
+ my ($o) = @_;
+ my $w = $o->wait_message('', _("Post install stuff"));
+ $o->SUPER::afterInstallPackages($o);
+}
+
#------------------------------------------------------------------------------
sub configureNetwork($) {
my ($o, $first_time) = @_;
@@ -601,7 +609,7 @@ _("Color depth options") => { val => \$o->{printer}{BITSPERPIXEL}, type => 'list
local *F; open F, "chroot $o->{prefix} /usr/bin/lpq |";
my @lpq_output = grep { !/^no entries/ && !(/^Rank\s+Owner/ .. /^\s*$/) } <F>;
- $w = undef; #- erase wait message window.
+ undef $w; #- erase wait message window.
if (@lpq_output) {
$action = $o->ask_yesorno('', _("Is this correct? Printing status:\n%s", "@lpq_output"), 1) ? 'done' : 'change';
} else {