Module Name: src
Committed By: simonb
Date: Fri Jun 4 11:55:45 UTC 2021
Modified Files:
src/sbin/mount: mount.8 mount.c
Log Message:
Remove the warning about autoselecting nfs based on : or @.
Ok jmcneill@, mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sbin/mount/mount.8
cvs rdiff -u -r1.103 -r1.104 src/sbin/mount/mount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount/mount.8
diff -u src/sbin/mount/mount.8:1.88 src/sbin/mount/mount.8:1.89
--- src/sbin/mount/mount.8:1.88 Sat Oct 24 10:51:34 2020
+++ src/sbin/mount/mount.8 Fri Jun 4 11:55:45 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount.8,v 1.88 2020/10/24 10:51:34 nia Exp $
+.\" $NetBSD: mount.8,v 1.89 2021/06/04 11:55:45 simonb Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)mount.8 8.8 (Berkeley) 6/16/94
.\"
-.Dd October 24, 2020
+.Dd June 4, 2021
.Dt MOUNT 8
.Os
.Sh NAME
@@ -137,10 +137,7 @@ or at sign
.Pq Ql \&@ ,
then the
.Li nfs
-type is inferred, but this behaviour is deprecated, and will be
-removed in a future version of
-.Nm .
-.Pp
+type is inferred.
In
.Nx ,
the file-system mounting policy is dictated by the running security models.
Index: src/sbin/mount/mount.c
diff -u src/sbin/mount/mount.c:1.103 src/sbin/mount/mount.c:1.104
--- src/sbin/mount/mount.c:1.103 Sun Oct 18 10:57:30 2020
+++ src/sbin/mount/mount.c Fri Jun 4 11:55:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mount.c,v 1.103 2020/10/18 10:57:30 mlelstv Exp $ */
+/* $NetBSD: mount.c,v 1.104 2021/06/04 11:55:45 simonb Exp $ */
/*
* Copyright (c) 1980, 1989, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
#else
-__RCSID("$NetBSD: mount.c,v 1.103 2020/10/18 10:57:30 mlelstv Exp $");
+__RCSID("$NetBSD: mount.c,v 1.104 2021/06/04 11:55:45 simonb Exp $");
#endif
#endif /* not lint */
@@ -294,11 +294,6 @@ out:
err(EXIT_FAILURE, "%s", buf);
if (vfslist == NULL) {
if (strpbrk(argv[0], ":@") != NULL) {
- fprintf(stderr, "WARNING: autoselecting nfs "
- "based on : or @ in the device name is "
- "deprecated!\n"
- "WARNING: This behaviour will be removed "
- "in a future release\n");
vfstype = "nfs";
} else {
vfstype = getfslab(mntfromname);
