diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-02-24 13:52:18 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-02-24 13:52:18 +0000 |
commit | 0e25513a828c03bfe66ac63e9987b8c9a0db2154 (patch) | |
tree | 2dc43d7786814ef3414a12043c885d6fb070ee80 /perl-install/fs/mount_options.pm | |
parent | dabdad37d667ce8584b4ce10d9c2ccdeff8ea612 (diff) | |
download | drakx-0e25513a828c03bfe66ac63e9987b8c9a0db2154.tar drakx-0e25513a828c03bfe66ac63e9987b8c9a0db2154.tar.gz drakx-0e25513a828c03bfe66ac63e9987b8c9a0db2154.tar.bz2 drakx-0e25513a828c03bfe66ac63e9987b8c9a0db2154.tar.xz drakx-0e25513a828c03bfe66ac63e9987b8c9a0db2154.zip |
if we remove a weird option, also remove nodev, noexec and nosuid
(but don't do it everytime, since those options can be usefully used for /tmp for example)
Diffstat (limited to 'perl-install/fs/mount_options.pm')
-rw-r--r-- | perl-install/fs/mount_options.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm index 56ee67eb8..f59a083f7 100644 --- a/perl-install/fs/mount_options.pm +++ b/perl-install/fs/mount_options.pm @@ -158,7 +158,12 @@ sub rationalize { delete $options->{'codepage='}; } if (member($part->{mntpoint}, fs::type::directories_needed_to_boot())) { - $options->{$_} = 0 foreach qw(users user noauto supermount); + foreach (qw(users user noauto supermount)) { + if ($options->{$_}) { + $options->{$_} = 0; + $options->{$_} = 0 foreach qw(nodev noexec nosuid); + } + } } &pack($part, $options, $unknown); |