diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_auto_install.pm | 1 | ||||
| -rw-r--r-- | perl-install/lang.pm | 15 | ||||
| -rw-r--r-- | perl-install/run_program.pm | 4 | ||||
| -rw-r--r-- | perl-install/share/aliases | 1 | ||||
| -rw-r--r-- | perl-install/share/list | 34 |
8 files changed, 46 insertions, 15 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 5584ee23f..77a3762be 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -110,7 +110,7 @@ endif cd $(DEST)/usr/bin ; mv insmod insmod_ rmdir $(DEST)/bin $(DEST)/sbin - perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' aliases + perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' share/aliases for i in fonts keyboards locales gconv; do tar xfy `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 071da6a3a..cb6df9274 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -743,7 +743,7 @@ sub main { -e "$o->{prefix}/usr/bin/urpmi" or eval { commands::rm("-rf", "$o->{prefix}/var/lib/urpmi") }; #- have the really bleeding edge ddebug.log for this f*cking msec :-/ - eval { commands::cp('-f', "/tmp/ddebug.log", "/tmp/exec.log", "$o->{prefix}/root") }; + eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") }; #- ala pixel? :-) [fpons] sync(); sync(); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 21b8b6dd4..83891d4dc 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -51,7 +51,7 @@ sub leavingStep { log::l("step `$step' finished"); if (-d "$o->{prefix}/root") { - eval { commands::cp('-f', "/tmp/ddebug.log", "/tmp/exec.log", "$o->{prefix}/root") }; + eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") }; install_any::g_auto_install(); } diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm index 6792708ca..333215dab 100644 --- a/perl-install/install_steps_auto_install.pm +++ b/perl-install/install_steps_auto_install.pm @@ -22,6 +22,7 @@ sub enteringStep($$$) { sub ask_warn { log::l(ref $_[1] ? join " ", @{$_[1]} : $_[1]); } +sub wait_message {} sub errorInStep { print "error :(\n"; diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 0638f2840..0350cd680 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -337,17 +337,12 @@ sub load_po($) { sub load_console_font { my ($lang) = @_; my ($charset) = $languages{$lang}[1] ; - my $f = "-f lat0-sun16"; - - if (my $c = $charsets{$charset}) { - if ($c->[0]) { $f = "-f " . $c->[0] ; } - if ($c->[1]) { $f = $f . " -u " . $c->[1] ; } - if ($c->[2]) { $f = $f . " -m " . $c->[2] ; } - } - - log::l("loading console font: consolechars $f"); - system("consolechars $f"); + my ($f, $u, $m) = @{$charsets{$charset} || []}; + run_program::run('consolechars', + ('-f', $f || 'lat0-sun16'), + $u ? ('-u', $u) : (), + $m ? ('-m', $m) : ()); } #-sub load_font { diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm index 73d8a9995..c6fa53234 100644 --- a/perl-install/run_program.pm +++ b/perl-install/run_program.pm @@ -33,12 +33,12 @@ sub rooted { $stderrm =~ s/2//; open STDERR, "$stderrm $root$stderr" or die "run_program can't output in $root$stderr (mode `$stderrm')"; } else { - open STDERR, ">> /tmp/exec.log" or open STDOUT, ">> /dev/tty7" or die "run_program can't log, give me access to /tmp/exec.log"; + open STDERR, ">> /tmp/ddebug.log" or open STDOUT, ">> /dev/tty7" or die "run_program can't log, give me access to /tmp/ddebug.log"; } if ($stdout) { open STDOUT, "$stdoutm $root$stdout" or die "run_program can't output in $root$stdout (mode `$stdoutm')"; } else { - open STDOUT, ">> /tmp/exec.log" or open STDOUT, ">> /dev/tty7" or die "run_program can't log, give me access to /tmp/exec.log"; + open STDOUT, ">> /tmp/ddebug.log" or open STDOUT, ">> /dev/tty7" or die "run_program can't log, give me access to /tmp/ddebug.log"; } $root and chroot $root; diff --git a/perl-install/share/aliases b/perl-install/share/aliases index 674c956eb..a5fa7def8 100644 --- a/perl-install/share/aliases +++ b/perl-install/share/aliases @@ -1,5 +1,6 @@ raidstop raidstart sh ash +gunzip gzip install2 perl-install/install2 commands perl-install/commands runinstall2 install2 diff --git a/perl-install/share/list b/perl-install/share/list index aba226dc8..c1112ce32 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -50,6 +50,40 @@ /usr/lib/gconv/ISO8859-6.so /usr/lib/gtk/themes/engines/libpixmap.so /usr/lib/gtk/themes/engines/libpixmap.la +/usr/lib/kbd/consolefonts/arm8.psf.gz +/usr/lib/kbd/consolefonts/t_geors.psf.gz +/usr/lib/kbd/consolefonts/lat0-sun16.psf.gz +/usr/lib/kbd/consolefonts/lat2-sun16.psf.gz +/usr/lib/kbd/consolefonts/iso03.f16.psf.gz +/usr/lib/kbd/consolefonts/lat4u-16.psf.gz +/usr/lib/kbd/consolefonts/iso05.f16.psf.gz +/usr/lib/kbd/consolefonts/iso06.f16.psf.gz +/usr/lib/kbd/consolefonts/iso07.f16.psf.gz +/usr/lib/kbd/consolefonts/iso08.f16.psf.gz +/usr/lib/kbd/consolefonts/iso09.f16.psf.gz +/usr/lib/kbd/consolefonts/tlat7.psf.gz +/usr/lib/kbd/consolefonts/tlat8.psf.gz +/usr/lib/kbd/consolefonts/koi8-8x16.psf.gz +/usr/lib/kbd/consolefonts/koi8u_8x16.psf.gz +/usr/lib/kbd/consolefonts/tcvn8x16.psf.gz +/usr/lib/kbd/consolefonts/viscii10-8x16.psf.gz +/usr/lib/kbd/consoletrans/armscii8.uni +/usr/lib/kbd/consoletrans/trivial.trans +/usr/lib/kbd/consoletrans/geors.uni +/usr/lib/kbd/consoletrans/geors_to_geops.trans +/usr/lib/kbd/consoletrans/iso15.acm.gz +/usr/lib/kbd/consoletrans/iso02.acm.gz +/usr/lib/kbd/consoletrans/iso03.acm.gz +/usr/lib/kbd/consoletrans/iso04.acm.gz +/usr/lib/kbd/consoletrans/iso05.sfm.gz +/usr/lib/kbd/consoletrans/iso05_to_cp1251.trans +/usr/lib/kbd/consoletrans/iso06.sfm.gz +/usr/lib/kbd/consoletrans/iso07.sfm.gz +/usr/lib/kbd/consoletrans/iso08.sfm.gz +/usr/lib/kbd/consoletrans/iso09.sfm.gz +/usr/lib/kbd/consoletrans/tcvn.sfm.gz +/usr/lib/kbd/consoletrans/viscii.uni +/usr/lib/kbd/consoletrans/viscii1.0_to_viscii1.1.trans /usr/lib/libimlib-png.so /usr/lib/perl5/5.6.0/AutoLoader.pm /usr/lib/perl5/5.6.0/Carp.pm |