summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-22 18:19:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-22 18:19:59 +0000
commit16589d408016879177d50c634db487e7454bed84 (patch)
tree89388185711b9e8222511b975c2884f83df298cd
parent489602da200d2bf800636fe7338b8fb5f0025d14 (diff)
downloaddrakx-16589d408016879177d50c634db487e7454bed84.tar
drakx-16589d408016879177d50c634db487e7454bed84.tar.gz
drakx-16589d408016879177d50c634db487e7454bed84.tar.bz2
drakx-16589d408016879177d50c634db487e7454bed84.tar.xz
drakx-16589d408016879177d50c634db487e7454bed84.zip
- cleanup noatime option setting
- cleanup exec option setting (must noexec => 0 instead of exec => 1)
-rw-r--r--perl-install/fs.pm11
-rw-r--r--perl-install/install2.pm8
2 files changed, 9 insertions, 10 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index fcf933adf..8fb7d4896 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -334,6 +334,13 @@ sub set_default_options {
$options->{sync} = 1;
}
+ if (isTrueFS($part)) {
+ #- noatime on laptops (do not wake up the hd)
+ #- Do not update inode access times on this
+ #- file system (e.g, for faster access on the
+ #- news spool to speed up news servers).
+ $options->{noatime} = detect_devices::isLaptop();
+ }
if (isNfs($part)) {
put_in_hash($options, {
nosuid => 1, 'rsize=8192,wsize=8192' => 1,
@@ -342,7 +349,7 @@ sub set_default_options {
if (isFat($part) || $is_auto) {
put_in_hash($options, {
- user => 1, exec => 1,
+ user => 1, noexec => 0,
}) if !exists $part->{rootDevice}; # partition means no removable media
put_in_hash($options, {
@@ -353,7 +360,7 @@ sub set_default_options {
put_in_hash($options, { 'iocharset=' => $iocharset });
}
if (isThisFs('iso9660', $part) || $is_auto) {
- put_in_hash($options, { user => 1, exec => 1, });
+ put_in_hash($options, { user => 1, noexec => 0, });
}
if (isThisFs('reiserfs', $part)) {
$options->{notail} = 1;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index a8c60cab8..a2d52ea20 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -175,14 +175,6 @@ sub formatPartitions {
require raid;
raid::prepare_prefixed($o->{all_hds}{raids}, $o->{prefix});
-
-#- chdir "$o->{prefix}"; was for core dumps
-
- #-noatime option for ext2 fs on laptops (do not wake up the hd)
- #- Do not update inode access times on this
- #- file system (e.g, for faster access on the
- #- news spool to speed up news servers).
- $o->{pcmcia} and $_->{options} = "noatime" foreach grep { isTrueFS($_) } @{$o->{fstab}};
}
#------------------------------------------------------------------------------