summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-06-04 22:30:45 +0000
committerThierry Vignaud <tv@mandriva.org>2007-06-04 22:30:45 +0000
commited0859891e951a8e73e099b1d8cd8a84d528d3ef (patch)
treedcb9e12faa6a7c4c6a561835af6c69c9fc52000f
parentbb3bf448ee74f85c6e2ed427473a94cc0b9b6f26 (diff)
downloaddrakx-ed0859891e951a8e73e099b1d8cd8a84d528d3ef.tar
drakx-ed0859891e951a8e73e099b1d8cd8a84d528d3ef.tar.gz
drakx-ed0859891e951a8e73e099b1d8cd8a84d528d3ef.tar.bz2
drakx-ed0859891e951a8e73e099b1d8cd8a84d528d3ef.tar.xz
drakx-ed0859891e951a8e73e099b1d8cd8a84d528d3ef.zip
(search_windows_font) do see fuse-mounted or ntfs-3g windows partitions (ffixxx, #28016)
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/drakfont2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2e5b34c2e..a189efb36 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,6 +5,8 @@
with the same fraction (eg #30090)
- diskdrake:
o when formatting ntfs don't zero partition (#30928)
+- drakfont:
+ o do see fuse-mounted or ntfs-3g windows partitions (ffixxx, #28016)
- drakhelp:
o fix .mozilla dir as root when it doesn't exists (#29775)
- draksec:
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 7dcfbdfad..177070d07 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -199,7 +199,7 @@ sub search_installed_fonts_full_path() {
}
sub search_windows_font() {
- foreach my $fstab_line (grep { /vfat|smbfs|ntfs/ } cat_('/etc/mtab')) {
+ foreach my $fstab_line (grep { /vfat|smbfs|ntfs|fuse/ } 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");