From owner-svn-src-user@freebsd.org Sun Oct 25 05:56:23 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE6297561 for ; Sun, 25 Oct 2015 05:56:23 +0000 (UTC) (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 63BDE1FE; Sun, 25 Oct 2015 05:56:23 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9P5uMUB021085; Sun, 25 Oct 2015 05:56:22 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P5uMaJ021083; Sun, 25 Oct 2015 05:56:22 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510250556.t9P5uMaJ021083@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 25 Oct 2015 05:56:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289918 - user/ngie/detangle-rc/etc/rc.d X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 05:56:23 -0000 Author: ngie Date: Sun Oct 25 05:56:22 2015 New Revision: 289918 URL: https://svnweb.freebsd.org/changeset/base/289918 Log: Try to fix the regression introduced in r282145 by making ldconfig only depend on FILESYSTEMS, then regen the ldconfig hints in mountcritremote if a remote file system was mounted TODO: test the change with a diskless /var Proposed patch for PR: 202726 Modified: user/ngie/detangle-rc/etc/rc.d/ldconfig user/ngie/detangle-rc/etc/rc.d/mountcritremote Modified: user/ngie/detangle-rc/etc/rc.d/ldconfig ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/ldconfig Sun Oct 25 05:52:53 2015 (r289917) +++ user/ngie/detangle-rc/etc/rc.d/ldconfig Sun Oct 25 05:56:22 2015 (r289918) @@ -4,7 +4,7 @@ # # PROVIDE: ldconfig -# REQUIRE: mountcritremote FILESYSTEMS +# REQUIRE: FILESYSTEMS # BEFORE: DAEMON . /etc/rc.subr Modified: user/ngie/detangle-rc/etc/rc.d/mountcritremote ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/mountcritremote Sun Oct 25 05:52:53 2015 (r289917) +++ user/ngie/detangle-rc/etc/rc.d/mountcritremote Sun Oct 25 05:56:22 2015 (r289918) @@ -34,12 +34,15 @@ mountcritremote_precmd() mountcritremote_start() { + local mounted_remote_filesystem=false + # Mount nfs filesystems. # case "`/sbin/mount -d -a -t nfs`" in '') ;; *) + mounted_remote_filesystem=true echo -n 'Mounting NFS file systems:' mount -a -t nfs echo '.' @@ -63,6 +66,7 @@ mountcritremote_start() case "`mount -d -a -t ${fstype}`" in *mount_${fstype}*) + mounted_remote_filesystem=true echo -n "Mounting ${fsdecr} file systems:" mount -a -t ${fstype} echo '.' @@ -70,9 +74,15 @@ mountcritremote_start() esac done - # Cleanup /var again just in case it's a network mount. - /etc/rc.d/cleanvar quietreload - rm -f /var/run/clean_var /var/spool/lock/clean_var + if $mounted_remote_filesystem; then + # Cleanup /var again just in case it's a network mount. + /etc/rc.d/cleanvar quietreload + rm -f /var/run/clean_var /var/spool/lock/clean_var + + # Regenerate the ldconfig hints in case there are additional + # library paths on remote file systems + /etc/rc.d/ldconfig quietstart + fi } load_rc_config $name