summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-02 05:31:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-02 05:31:30 +0000
commit4547b43b69d27a7f5a501d8768be6a7d32fd343e (patch)
tree2e920cd0505e1254e1e7ec4caa7f70ac9c0a5eda
parent5f256c73d599edd3e475e694abdd8c4cd1384a2d (diff)
downloaddrakx-backup-do-not-use-4547b43b69d27a7f5a501d8768be6a7d32fd343e.tar
drakx-backup-do-not-use-4547b43b69d27a7f5a501d8768be6a7d32fd343e.tar.gz
drakx-backup-do-not-use-4547b43b69d27a7f5a501d8768be6a7d32fd343e.tar.bz2
drakx-backup-do-not-use-4547b43b69d27a7f5a501d8768be6a7d32fd343e.tar.xz
drakx-backup-do-not-use-4547b43b69d27a7f5a501d8768be6a7d32fd343e.zip
workaround missing nls_xxx module during install differently
-rw-r--r--perl-install/fs/mount.pm2
-rw-r--r--perl-install/fs/mount_options.pm10
2 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm
index 40bc07f05..f75284e1d 100644
--- a/perl-install/fs/mount.pm
+++ b/perl-install/fs/mount.pm
@@ -58,6 +58,8 @@ sub mount {
if ($fs eq 'vfat') {
@mount_opt = 'check=relaxed';
+ } elsif ($fs eq 'ntfs') {
+ @mount_opt = () if $::isInstall; # esp. drop nls=xxx option so that we don't need kernel module nls_xxx
} elsif ($fs eq 'nfs') {
push @mount_opt, 'nolock', 'soft', 'intr' if $::isInstall;
} elsif ($fs eq 'jfs' && !$b_rdonly) {
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 66d3683d7..383490bb6 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -221,13 +221,9 @@ sub set_default {
});
}
if ($part->{fs_type} eq 'ntfs') {
- 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} })
- }
+ put_in_hash($options, { ro => 1, 'nls=' => $opts{iocharset},
+ 'umask=0' => $opts{security} < 3, 'umask=0022' => $opts{security} < 4,
+ });
}
if (fs::type::can_be_this_fs_type($part, 'iso9660')) {
put_in_hash($options, { user => 1, noexec => 0, 'iocharset=' => $opts{iocharset} });