summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-30 11:37:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-30 11:37:12 +0000
commit543d0c7448504efaed4ef776f97936337849718b (patch)
tree2210cb0939e46ce0823689fd36186a13fdf82c6b /perl-install
parentb2a7fbea067fbbacf4d42cc28c881531f77a407f (diff)
downloaddrakx-543d0c7448504efaed4ef776f97936337849718b.tar
drakx-543d0c7448504efaed4ef776f97936337849718b.tar.gz
drakx-543d0c7448504efaed4ef776f97936337849718b.tar.bz2
drakx-543d0c7448504efaed4ef776f97936337849718b.tar.xz
drakx-543d0c7448504efaed4ef776f97936337849718b.zip
(set_default_options): "ro" for cdroms, "user" for vfat only if removable
media
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs.pm12
1 files changed, 10 insertions, 2 deletions
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) {