- fix handling relatime vs noatime

  (esp. relatime is not the opposite of atime, noatime is)
- fix titypo: norelatime doesn't exist

2 files changed, 6 insertions, 2 deletions

diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index acca8f01e..aac735029 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -960,6 +960,9 @@ sub Options {
 	# we don't want both user and users
 	user => sub { $options->{users} = 0; $options->{$_} = $options->{user} foreach @$user_implies },
 	users => sub { $options->{user} = 0; $options->{$_} = $options->{users} foreach @$user_implies },
+	# we don't want both relatime and noatime
+	relatime => sub { $options->{noatime} = 0 },
+	noatime => sub { $options->{relatime} = 0 },
     );
 	
 
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 21e042acd..3bec94ab9 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -12,7 +12,7 @@ sub list() {
     my %non_defaults = (
 			sync => 'async', noatime => 'atime', noauto => 'auto', ro => 'rw', 
 			user => 'nouser', nodev => 'dev', noexec => 'exec', nosuid => 'suid',
-			user_xattr => 'nouser_xattr', relatime => 'atime',
+			user_xattr => 'nouser_xattr',
 		       );
     my @user_implies = qw(noexec nodev nosuid);
     \%non_defaults, \@user_implies;
@@ -41,6 +41,7 @@ sub unpack {
 	$non_defaults->{$_} = 1 foreach @$l;
     }
 
+    $non_defaults->{relatime} = 1 if isTrueFS($part);
     $non_defaults->{encrypted} = 1;
 
     my $defaults = { reverse %$non_defaults };
@@ -117,7 +118,7 @@ sub help() {
 	'noatime' => N("Do not update inode access times on this file system
 (e.g, for faster access on the news spool to speed up news servers)."),
 
-	'norelatime' => N("Update inode access times on this filesystem in a more efficient way
+	'relatime' => N("Update inode access times on this filesystem in a more efficient way
 (e.g, for faster access on the news spool to speed up news servers)."),
 
 	'noauto' => N("Can only be mounted explicitly (i.e.,