From 265ac5ab54f046e2bcc1c8c5dab88b15f555a4d0 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Tue, 26 Jul 2005 12:13:29 +0000
Subject: workarround ntfs mount bug

---
 perl-install/fs/mount_options.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'perl-install/fs')

diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 383490bb6..66d3683d7 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -221,9 +221,13 @@ sub set_default {
 			      });
     }
     if ($part->{fs_type} eq 'ntfs') {
-	put_in_hash($options, { ro => 1, 'nls=' => $opts{iocharset},
-				'umask=0' => $opts{security} < 3, 'umask=0022' => $opts{security} < 4,
-			      });
+	put_in_hash($options, { ro => 1,
+	                        'umask=0' => $opts{security} < 3, 'umask=0022' => $opts{security} < 4,
+	                          });
+	eval { modules::load("nls_$opts{iocharset}") };
+	if (!$@) {
+	    add2hash($options, { 'nls=' => $opts{iocharset} })
+	}
     }
     if (fs::type::can_be_this_fs_type($part, 'iso9660')) {
 	put_in_hash($options, { user => 1, noexec => 0, 'iocharset=' => $opts{iocharset} });
-- 
cgit v1.2.1