diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:03 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:03 +0000 |
| commit | 3a8cb984c2bbf56c37a0b48c3d370e9488763123 (patch) | |
| tree | 653e1e67dfea57a9f07d05dcab218a791472cfda | |
| parent | 04531bce1fbd0921f958bd89f2d9d2a30f79b33a (diff) | |
| download | drakx-3a8cb984c2bbf56c37a0b48c3d370e9488763123.tar drakx-3a8cb984c2bbf56c37a0b48c3d370e9488763123.tar.gz drakx-3a8cb984c2bbf56c37a0b48c3d370e9488763123.tar.bz2 drakx-3a8cb984c2bbf56c37a0b48c3d370e9488763123.tar.xz drakx-3a8cb984c2bbf56c37a0b48c3d370e9488763123.zip | |
(pre_init_brltty) split it out of main()
| -rw-r--r-- | perl-install/install/install2.pm | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 0be9e23ca..c4a2c112e 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -334,6 +334,17 @@ sub init_local_install { $o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice'); } +sub pre_init_brltty() { + if (my ($s) = cat_("/proc/cmdline") =~ /brltty=(\S*)/) { + my ($driver, $device, $table) = split(',', $s); + $table = "text.$table.tbl" if $table !~ /\.tbl$/; + log::l("brltty option $driver $device $table"); + $o->{brltty} = { driver => $driver, device => $device, table => $table }; + $o->{interactive} = 'curses'; + $o->{nomouseprobe} = 1; + } +} + sub init_brltty() { symlink "/tmp/stage2/$_", $_ foreach "/etc/brltty"; devices::make($_) foreach $o->{brltty}{device} ? $o->{brltty}{device} : qw(ttyS0 ttyS1); @@ -588,14 +599,7 @@ sub main { $o->{interactive} = "curses"; } - if (my ($s) = cat_("/proc/cmdline") =~ /brltty=(\S*)/) { - my ($driver, $device, $table) = split(',', $s); - $table = "text.$table.tbl" if $table !~ /\.tbl$/; - log::l("brltty option $driver $device $table"); - $o->{brltty} = { driver => $driver, device => $device, table => $table }; - $o->{interactive} = 'curses'; - $o->{nomouseprobe} = 1; - } + pre_init_brltty(); # perl_checker: require install::steps_gtk # perl_checker: require install::steps_curses |