From owner-svn-src-head@freebsd.org  Sat Oct 27 17:15:59 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB85D10CCFCC;
 Sat, 27 Oct 2018 17:15:59 +0000 (UTC)
 (envelope-from eugen@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 7F45472D2F;
 Sat, 27 Oct 2018 17:15:59 +0000 (UTC)
 (envelope-from eugen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 604DC1341B;
 Sat, 27 Oct 2018 17:15:59 +0000 (UTC)
 (envelope-from eugen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9RHFxWN024592;
 Sat, 27 Oct 2018 17:15:59 GMT (envelope-from eugen@FreeBSD.org)
Received: (from eugen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9RHFxqD024591;
 Sat, 27 Oct 2018 17:15:59 GMT (envelope-from eugen@FreeBSD.org)
Message-Id: <201810271715.w9RHFxqD024591@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eugen set sender to
 eugen@FreeBSD.org using -f
From: Eugene Grosbein <eugen@FreeBSD.org>
Date: Sat, 27 Oct 2018 17:15:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r339817 - head/libexec/makewhatis.local
X-SVN-Group: head
X-SVN-Commit-Author: eugen
X-SVN-Commit-Paths: head/libexec/makewhatis.local
X-SVN-Commit-Revision: 339817
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Oct 2018 17:16:00 -0000

Author: eugen
Date: Sat Oct 27 17:15:58 2018
New Revision: 339817
URL: https://svnweb.freebsd.org/changeset/base/339817

Log:
  makewhatis: do not try to operate on read-only mounted directories
  just to fail later.
  
  MFC after:	1 month

Modified:
  head/libexec/makewhatis.local/makewhatis.local.sh

Modified: head/libexec/makewhatis.local/makewhatis.local.sh
==============================================================================
--- head/libexec/makewhatis.local/makewhatis.local.sh	Sat Oct 27 16:41:34 2018	(r339816)
+++ head/libexec/makewhatis.local/makewhatis.local.sh	Sat Oct 27 17:15:58 2018	(r339817)
@@ -47,10 +47,10 @@ done
 dirs=`echo $dirs | sed 's/:/ /g'`
 case X"$dirs" in X) echo "usage: $0 [options] directories ..."; exit 1;; esac
 
-localdirs=`find -H $dirs -fstype local -type d -prune -print`
+localdirs=`find -H $dirs -fstype local \! -fstype rdonly -type d -prune -print`
 
 case X"$localdirs" in
-	X) 	echo "$0: no local-mounted manual directories found: $dirs"
+	X) 	echo "$0: no local rw-mounted manual directories found: $dirs"
 		exit 1;;
 	*) 	exec `basename $0 .local` $opt $localdirs;;
 esac