From owner-svn-src-stable@freebsd.org Mon Nov 26 13:08:35 2018 Return-Path: Delivered-To: svn-src-stable@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 BF5411133EE7; Mon, 26 Nov 2018 13:08:35 +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 5957E72BF2; Mon, 26 Nov 2018 13:08:35 +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 3A5244537; Mon, 26 Nov 2018 13:08:35 +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 wAQD8ZG9078440; Mon, 26 Nov 2018 13:08:35 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAQD8Zxn078439; Mon, 26 Nov 2018 13:08:35 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811261308.wAQD8Zxn078439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Mon, 26 Nov 2018 13:08:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r340964 - stable/10/usr.bin/makewhatis X-SVN-Group: stable-10 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: stable/10/usr.bin/makewhatis X-SVN-Commit-Revision: 340964 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5957E72BF2 X-Spamd-Result: default: False [1.49 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.32)[0.320,0]; NEURAL_SPAM_MEDIUM(0.56)[0.562,0]; NEURAL_SPAM_LONG(0.61)[0.611,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2018 13:08:35 -0000 Author: eugen Date: Mon Nov 26 13:08:34 2018 New Revision: 340964 URL: https://svnweb.freebsd.org/changeset/base/340964 Log: makewhatis: do not try to operate on read-only mounted directories just to fail later. This is direct commit to stable/10 instead of MFC r339817 due to makewhatis.local being moved in recent branches. Modified: stable/10/usr.bin/makewhatis/makewhatis.local.sh Modified: stable/10/usr.bin/makewhatis/makewhatis.local.sh ============================================================================== --- stable/10/usr.bin/makewhatis/makewhatis.local.sh Mon Nov 26 13:03:34 2018 (r340963) +++ stable/10/usr.bin/makewhatis/makewhatis.local.sh Mon Nov 26 13:08:34 2018 (r340964) @@ -49,10 +49,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