From 543d0c7448504efaed4ef776f97936337849718b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 30 Aug 2001 11:37:12 +0000
Subject: (set_default_options): "ro" for cdroms, "user" for vfat only if
 removable media

---
 perl-install/fs.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 21068db05..ab6c2a230 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -312,6 +312,10 @@ sub set_default_options {
 	    $is_auto = 0;
 	}
 
+	if ($part->{media_type} eq 'cdrom') {
+	    $options->{ro} = 1;
+	}
+
 	if ($part->{media_type} eq 'fd') {
 	    # slow device so don't loose time, write now!
 	    $options->{sync} = 1;
@@ -324,9 +328,13 @@ sub set_default_options {
             });
 	}
 	if (isFat($part) || $is_auto) {
+
+	    put_in_hash($options, {
+	        user => 1, exec => 1,
+            }) if !exists $part->{rootDevice}; # partition means no removable media
+
 	    put_in_hash($options, {
-	        user => 1, 'umask=0' => $security < 3, exec => 1,
-	        'iocharset=' => $iocharset, 'codepage=' => $codepage,
+                'umask=0' => $security < 3, 'iocharset=' => $iocharset, 'codepage=' => $codepage,
             });
 	}
 	if (isThisFs('ntfs', $part) || $is_auto) {
-- 
cgit v1.2.1