From 11ce5bb8aad7f3e0670adbc9a7525237ee53a044 Mon Sep 17 00:00:00 2001
From: millert <millert@openbsd.org>
Date: Mon, 10 Mar 1997 04:27:41 +0000
Subject: [PATCH] Allow noaccesstime as a synonym for noatime.

---
 sbin/mount/mntopts.h | 6 ++++--
 sbin/mount/mount.8   | 7 +++++--
 sbin/mount/mount.c   | 5 +++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 73207de3122..f01f70a1eac 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mntopts.h,v 1.4 1997/03/09 19:27:59 millert Exp $	*/
+/*	$OpenBSD: mntopts.h,v 1.5 1997/03/10 04:27:41 millert Exp $	*/
 /*	$NetBSD: mntopts.h,v 1.3 1995/03/18 14:56:59 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,8 @@ struct mntopt {
 
 /* User-visible MNT_ flags. */
 #define MOPT_ASYNC		{ "async",	0, MNT_ASYNC }
-#define MOPT_NOATIME		{ "accesstime",	1, MNT_NOATIME }
+#define MOPT_NOACCESSTIME	{ "accesstime",	1, MNT_NOATIME }
+#define MOPT_NOATIME		{ "atime",	1, MNT_NOATIME }
 #define MOPT_NODEV		{ "dev",	1, MNT_NODEV }
 #define MOPT_NOEXEC		{ "exec",	1, MNT_NOEXEC }
 #define MOPT_NOSUID		{ "suid",	1, MNT_NOSUID }
@@ -76,6 +77,7 @@ struct mntopt {
 	MOPT_USERQUOTA,							\
 	MOPT_GROUPQUOTA,						\
 	MOPT_FSTAB_COMPAT,						\
+	MOPT_NOACCESSTIME,						\
 	MOPT_NOATIME,							\
 	MOPT_NODEV,							\
 	MOPT_NOEXEC,							\
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 8a665e4ec1d..508a4f733a9 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount.8,v 1.4 1997/03/09 19:28:01 millert Exp $
+.\"	$OpenBSD: mount.8,v 1.5 1997/03/10 04:27:41 millert Exp $
 .\"	$NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -129,11 +129,14 @@ The same as
 .Fl f ;
 forces the revocation of write access when trying to downgrade
 a filesystem mount status from read-write to read-only.
-.It noaccesstime
+.It noatime
 Do not update atime on files in the system unless the mtime or ctime
 is being changed as well.
 This option is useful for laptops and news servers where one does
 not want the extra disk activity associated with updating the atime.
+.It noaccesstime
+Synonym for noatime provided for compatibility with
+other OS's.
 .It nodev
 Do not interpret character or block special devices on the file system.
 This option is useful for a server that has file systems containing
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 0a33b45306b..0078da58d6d 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.c,v 1.15 1997/03/09 19:28:01 millert Exp $	*/
+/*	$OpenBSD: mount.c,v 1.16 1997/03/10 04:27:42 millert Exp $	*/
 /*	$NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount.c	8.19 (Berkeley) 4/19/94";
 #else
-static char rcsid[] = "$OpenBSD: mount.c,v 1.15 1997/03/09 19:28:01 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount.c,v 1.16 1997/03/10 04:27:42 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -93,6 +93,7 @@ static struct opt {
 	{ MNT_EXPORTANON,	1,	"anon uid mapping" },
 	{ MNT_EXRDONLY,		1,	"exported read-only" },
 	{ MNT_LOCAL,		0,	"local" },
+	{ MNT_NOATIME,		0,	"noatime" },
 	{ MNT_NOATIME,		0,	"noaccesstime" },
 	{ MNT_NODEV,		0,	"nodev" },
 	{ MNT_NOEXEC,		0,	"noexec" },
-- 
2.20.1