From 095b00c20229ae1ebc6d7a76854c033486a7f132 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 14 Aug 2007 09:52:30 +0000
Subject: - diskdrake:   o in fstab, have "xxx" instead of "defaults,xxx"

---
 perl-install/NEWS                | 1 +
 perl-install/fs/mount_options.pm | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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