summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2005-07-26 12:13:29 +0000
committerFlorent Villard <warly@mandriva.com>2005-07-26 12:13:29 +0000
commit265ac5ab54f046e2bcc1c8c5dab88b15f555a4d0 (patch)
tree051289f217c6f44d7bb6f65b8d61fe4eec620118
parentf93a644e3d4d9cd81f6e377dc57fa46c906929ae (diff)
downloaddrakx-265ac5ab54f046e2bcc1c8c5dab88b15f555a4d0.tar
drakx-265ac5ab54f046e2bcc1c8c5dab88b15f555a4d0.tar.gz
drakx-265ac5ab54f046e2bcc1c8c5dab88b15f555a4d0.tar.bz2
drakx-265ac5ab54f046e2bcc1c8c5dab88b15f555a4d0.tar.xz
drakx-265ac5ab54f046e2bcc1c8c5dab88b15f555a4d0.zip
workarround ntfs mount bug
-rw-r--r--perl-install/fs/mount_options.pm10
1 files changed, 7 insertions, 3 deletions
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} });