From 0e25513a828c03bfe66ac63e9987b8c9a0db2154 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 24 Feb 2005 13:52:18 +0000
Subject: 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)

---
 perl-install/fs/mount_options.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/fs/mount_options.pm')

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);
-- 
cgit v1.2.1