summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-05 13:04:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-05 13:04:12 +0000
commitb8f187b44cdb8addd2b89039bcc4459f3b5ea924 (patch)
tree2173caf1810e45aac3baf635ebc10a1437036aa1 /perl-install
parentb5ad96507fde84761d28df2930b1117a4e5f44f2 (diff)
downloaddrakx-b8f187b44cdb8addd2b89039bcc4459f3b5ea924.tar
drakx-b8f187b44cdb8addd2b89039bcc4459f3b5ea924.tar.gz
drakx-b8f187b44cdb8addd2b89039bcc4459f3b5ea924.tar.bz2
drakx-b8f187b44cdb8addd2b89039bcc4459f3b5ea924.tar.xz
drakx-b8f187b44cdb8addd2b89039bcc4459f3b5ea924.zip
- add a beep in case of brltty error message
- probe mouse before running brltty
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 906ca3786..286f05c4a 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -513,9 +513,6 @@ sub main {
require harddrake::sound;
harddrake::sound::configure_sound_slots();
- #- needed very early for install_steps_gtk
- eval { $o->{mouse} = mouse::detect() } if !$o->{nomouseprobe} && !$o->{mouse} && !$::testing;
-
#- need to be after oo-izing $o
if ($o->{brltty}) {
symlink "/tmp/stage2/$_", $_ foreach "/etc/brltty";
@@ -527,8 +524,9 @@ sub main {
install_any::getAndSaveFile($_ , "/tmp/stage2/$_") if $_;
}
install_any::getAndSaveFile("/lib/brltty/libbrlttyb$o->{brltty}{driver}.so") or do {
- warn("Braille driver $o->{brltty}{driver} for BRLTTY was not found.\n",
- "Press ENTER to continue.\n");
+ local $| = 1;
+ print("Braille driver $o->{brltty}{driver} for BRLTTY was not found.\n",
+ "Press ENTER to continue.\n\a");
<STDIN>;
};
install_any::getAndSaveFile("/usr/bin/brltty");
@@ -538,6 +536,9 @@ sub main {
run_program::run("brltty");
}
+ #- needed very early for install_steps_gtk
+ eval { $o->{mouse} = mouse::detect() } if !$o->{nomouseprobe} && !$o->{mouse} && !$::testing;
+
$o->{lang} = lang::set($o->{lang}) if $o->{lang} ne 'en_US'; #- mainly for defcfg
start_i810fb();