svn commit: r364207 - stable/12/sys/compat/linprocfs

Edward Tomasz Napierala trasz at FreeBSD.org
Thu Aug 13 18:50:33 UTC 2020


Author: trasz
Date: Thu Aug 13 18:50:32 2020
New Revision: 364207
URL: https://svnweb.freebsd.org/changeset/base/364207

Log:
  MFC r351822:
  
  Fix /proc/mounts for autofs(5) mounts.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/12/sys/compat/linprocfs/linprocfs.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- stable/12/sys/compat/linprocfs/linprocfs.c	Thu Aug 13 18:49:12 2020	(r364206)
+++ stable/12/sys/compat/linprocfs/linprocfs.c	Thu Aug 13 18:50:32 2020	(r364207)
@@ -462,6 +462,15 @@ linprocfs_domtab(PFS_FILL_ARGS)
 		else if (strcmp(fstype, "procfs") == 0)
 			continue;
 
+		if (strcmp(fstype, "autofs") == 0) {
+			/*
+			 * FreeBSD uses eg "map -hosts", whereas Linux
+			 * expects just "-hosts".
+			 */
+			if (strncmp(mntfrom, "map ", 4) == 0)
+				mntfrom += 4;
+		}
+
 		if (strcmp(fstype, "linsysfs") == 0) {
 			sbuf_printf(sb, "/sys %s sysfs %s", mntto,
 			    sp->f_flags & MNT_RDONLY ? "ro" : "rw");


More information about the svn-src-stable-12 mailing list