summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakfont
diff options
context:
space:
mode:
authorSebastien Dupont <sdupont@mandriva.com>2001-11-01 02:38:21 +0000
committerSebastien Dupont <sdupont@mandriva.com>2001-11-01 02:38:21 +0000
commit38e082937662a522cd61e8065ba13997a2c56588 (patch)
tree17f09c50317c56be286a6557e2a6e82b967f68c4 /perl-install/standalone/drakfont
parent6629b3a69a50ea42b634a0aa11deaaa625f74e94 (diff)
downloaddrakx-backup-do-not-use-38e082937662a522cd61e8065ba13997a2c56588.tar
drakx-backup-do-not-use-38e082937662a522cd61e8065ba13997a2c56588.tar.gz
drakx-backup-do-not-use-38e082937662a522cd61e8065ba13997a2c56588.tar.bz2
drakx-backup-do-not-use-38e082937662a522cd61e8065ba13997a2c56588.tar.xz
drakx-backup-do-not-use-38e082937662a522cd61e8065ba13997a2c56588.zip
ext2 -> vfat during windows import.
Diffstat (limited to 'perl-install/standalone/drakfont')
-rwxr-xr-xperl-install/standalone/drakfont7
1 files changed, 6 insertions, 1 deletions
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) {