diff options
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 3bef8b6bf..1108398a5 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -113,7 +113,7 @@ sub selectInstallClass($@) { } #------------------------------------------------------------------------------ sub setupSCSI { - modules::load("ide-mod", 'prereq', 'options="' . detect_devices::hasHPT() . '"'); + modules::load("ide-mod", 'prereq', 'options="' . detect_devices::hasUltra66() . '"'); modules::load_multi(qw(ide-probe ide-disk ide-cd)); modules::load_thiskind('scsi'); } @@ -247,6 +247,8 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK! sub afterInstallPackages($) { my ($o) = @_; + return if $::g_auto_install; + -x "$o->{prefix}/usr/bin/dumpkeys" or $::testing or die "Some important packages didn't get installed properly. @@ -316,6 +318,19 @@ Consoles 1,3,4,7 may also contain interesting information"; } } + my $hasttf; + my $dest = "$o->{prefix}/usr/X11R6/lib/X11/fonts/drakfont"; + foreach (map { $_->{mntpoint} } grep { isFat($_) } @{$o->{fstab}}) { + my $d = "$_/windows/fonts"; + -d "$o->{prefix}$d" or next; + unless ($hasttf) { + mkdir $dest, 0755; + $hasttf = 1; + } + /(.*)\.ttf/i and symlink "$d/$_", "$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$d"); + } + run_program::rooted($o->{prefix}, "ttmkfdir", "-d", $dest, "-o", "$dest/fonts.dir") if $hasttf; + foreach (install_any::list_skels()) { my $found; substInFile { @@ -667,7 +682,7 @@ sub setupBootloader($) { eval { lilo::install($o->{prefix}, $o->{bootloader}, $o->{fstab}) }; my $err = $@; eval { lilo::install_grub($o->{prefix}, $o->{bootloader}, $o->{fstab}, $o->{hds}) }; - die $err if $err; + die $err if $@; } } @@ -686,6 +701,8 @@ sub setupXfreeBefore { require Xconfig; Xconfig::getinfoFromDDC($o->{X}); + $::xf4 = 1; + #- keep this here if the package has to be updated. install_any::pkg_install($o, "XFree86"); } @@ -759,6 +776,11 @@ sub miscellaneous { } #------------------------------------------------------------------------------ +sub generateAutoInstFloppy($) { + my ($o) = @_; +} + +#------------------------------------------------------------------------------ sub cleanIfFailedUpgrade($) { my ($o) = @_; |