From 327faf4d7e01b06d7dd993793a8b647fcefacfb0 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 1 Apr 2010 12:49:18 -0700
Subject: [PATCH] Allow noatime to be set for all linux filesystems

---
 mount/help/linux_noatime.html |  9 +++++++++
 mount/linux-lib.pl            | 20 +++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 mount/help/linux_noatime.html

diff --git a/mount/help/linux_noatime.html b/mount/help/linux_noatime.html
new file mode 100644
index 000000000..fc74037c7
--- /dev/null
+++ b/mount/help/linux_noatime.html
@@ -0,0 +1,9 @@
+<header>Avoid updating last access times?</header>
+
+By default, whenever a file is read Linux will update it's last
+access time. Since this information is rarely used and can be
+expensive to store, changing to option to <b>Yes</b> will turn
+off recording this access time. <p>
+
+<footer>
+
diff --git a/mount/linux-lib.pl b/mount/linux-lib.pl
index dbfb58b42..2c2488568 100755
--- a/mount/linux-lib.pl
+++ b/mount/linux-lib.pl
@@ -1179,6 +1179,14 @@ if ($_[0] ne "swap" && $_[0] ne "auto" &&
 		defined($options{"user"}) ? "checked" : "";
 	printf "<input type=radio name=lnx_user value=0 %s> $text{'no'}</td> </tr>\n",
 		defined($options{"user"}) ? "" : "checked";
+
+	print "<td>", &hlink("<b>$text{'linux_noatime'}</b>", "linux_noatime"), "</td>\n";
+	printf "<td><input type=radio name=lnx_noatime value=1 %s> %s\n",
+	    defined($options{"noatime"}) ? "checked" : "", $text{'yes'};
+	printf "<input type=radio name=lnx_noatime value=0 %s> %s</td>\n",
+	    defined($options{"noatime"}) ? "" : "checked", $text{'no'};
+
+	print "</tr>\n";
 	}
 	
 if ($_[0] =~ /^ext\d+$/) {
@@ -1254,12 +1262,6 @@ if ($_[0] =~ /^ext\d+$/) {
 	printf "<td><input name=ext2_resgid size=8 value=\"%s\">\n",
 		defined($options{"resgid"}) ? getgrgid($options{"resgid"}) : "";
 	print &group_chooser_button("ext2_resgid", 0),"</td> </tr>\n";
-
-	print "<tr> <td><b>$text{'linux_noatime'}</b></td>\n";
-	printf "<td><input type=radio name=ext2_noatime value=1 %s> %s\n",
-	    defined($options{"noatime"}) ? "checked" : "", $text{'yes'};
-	printf "<input type=radio name=ext2_noatime value=0 %s> %s</td>\n",
-	    defined($options{"noatime"}) ? "" : "checked", $text{'no'};
 	}
 elsif (($_[0] eq "nfs") || ($_[0] eq "nfs4")) {
 	# Linux nfs has some more options...
@@ -1928,6 +1930,9 @@ if ($_[0] ne "swap" && $_[0] ne "auto" &&
 
 	delete($options{"user"}); delete($options{"nouser"});
 	if ($in{lnx_user}) { $options{"user"} = ""; }
+
+	delete($options{"noatime"});
+	$options{"noatime"} = "" if ($in{'lnx_noatime'});
 	}
 
 if (($_[0] eq "nfs") || ($_[0] eq "nfs4")) {
@@ -2006,9 +2011,6 @@ elsif ($_[0] =~ /^ext\d+$/) {
 	elsif ($in{'ext2_quota'} == 2) { $options{'grpquota'} = ""; }
 	elsif ($in{'ext2_quota'} == 3)
 		{ $options{'usrquota'} = $options{'grpquota'} = ""; }
-
-	delete($options{"noatime"});
-	$options{"noatime"} = "" if ($in{'ext2_noatime'});
 	}
 elsif ($_[0] eq "fat" || $_[0] eq "vfat" ||
        $_[0] eq "msdos" || $_[0] eq "umsdos" || $_[0] eq "fatx") {