summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-14 09:52:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-14 09:52:30 +0000
commit095b00c20229ae1ebc6d7a76854c033486a7f132 (patch)
treeea0425f8c282e0f7ea2d56c0a4b1bf36156f8fca
parent97b738004879841701f9d7f6e34b047c811809f4 (diff)
downloaddrakx-095b00c20229ae1ebc6d7a76854c033486a7f132.tar
drakx-095b00c20229ae1ebc6d7a76854c033486a7f132.tar.gz
drakx-095b00c20229ae1ebc6d7a76854c033486a7f132.tar.bz2
drakx-095b00c20229ae1ebc6d7a76854c033486a7f132.tar.xz
drakx-095b00c20229ae1ebc6d7a76854c033486a7f132.zip
- diskdrake:
o in fstab, have "xxx" instead of "defaults,xxx"
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs/mount_options.pm4
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c120aaa3c..9d30deb37 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,7 @@
- diskdrake:
o add support for 'relatime' mount option
o kill support for 'nodiratime' mount option
+ o in fstab, have "xxx" instead of "defaults,xxx"
Version 10.4.167 - 11 August 2007, by Thierry Vignaud
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 3bec94ab9..8c88607bf 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -48,7 +48,9 @@ sub unpack {
my %options = map { $_ => '' } keys %$non_defaults;
my @unknown;
foreach (split(",", $packed_options)) {
- if (member($_, 'user', 'users')) {
+ if ($_ eq 'defaults') {
+ #- skip
+ } elsif (member($_, 'user', 'users')) {
$options{$_} = 1 foreach $_, @$user_implies;
} elsif (exists $non_defaults->{$_}) {
$options{$_} = 1;