From 38e082937662a522cd61e8065ba13997a2c56588 Mon Sep 17 00:00:00 2001 From: Sebastien Dupont Date: Thu, 1 Nov 2001 02:38:21 +0000 Subject: ext2 -> vfat during windows import. --- perl-install/standalone/drakfont | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 0a50f8948..5d50768c5 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -243,7 +243,7 @@ sub search_installed_fonts_full_path { } sub search_windows_font { - foreach my $fstab_line (grep { /ext2/ } cat_('/etc/mtab') ) { + foreach my $fstab_line (grep { /vfat/ } cat_('/etc/mtab') ) { my $win_dir = (split('\s', $fstab_line))[1]; my @list_fonts_win = all("$win_dir/windows/fonts"); my @list_fonts_winnt = all("$win_dir/winnt/fonts"); @@ -253,6 +253,11 @@ sub search_windows_font { $interactive and display_error(_("could not find any font in %s/win*/fonts", $win_dir)); return 0; } + if(!@list_fonts_win && !@list_fonts_winnt) { + print "drakfont:: could not find any font in $win_dir/win*/fonts \n"; + $interactive and display_error(_("could not find any font in %s/win*/fonts", $win_dir)); + return 0; + } foreach $_ ([\@list_fonts_win, "windows"], [\@list_fonts_winnt, "winnt"]) { foreach my $i (@{$_->[0]}) { if($interactive) { -- cgit v1.2.1