From owner-svn-src-head@FreeBSD.ORG  Mon Sep 14 16:52:39 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4749D1065672;
	Mon, 14 Sep 2009 16:52:39 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 36CD58FC1F;
	Mon, 14 Sep 2009 16:52:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8EGqdNc060472;
	Mon, 14 Sep 2009 16:52:39 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8EGqdd1060471;
	Mon, 14 Sep 2009 16:52:39 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <200909141652.n8EGqdd1060471@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 14 Sep 2009 16:52:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197196 - head/etc/rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Sep 2009 16:52:39 -0000

Author: emaste
Date: Mon Sep 14 16:52:38 2009
New Revision: 197196
URL: http://svn.freebsd.org/changeset/base/197196

Log:
  Protect cross-script invocation by checking that the target script exists.
  This allows pruning of rc.d scripts without getting too many ugly boottime
  error messages.
  
  Inspired by phk's r128714 change to netif.

Modified:
  head/etc/rc.d/ppp

Modified: head/etc/rc.d/ppp
==============================================================================
--- head/etc/rc.d/ppp	Mon Sep 14 16:16:07 2009	(r197195)
+++ head/etc/rc.d/ppp	Mon Sep 14 16:52:38 2009	(r197196)
@@ -95,8 +95,12 @@ ppp_poststart()
 {
 	# Re-Sync ipfilter and pf so they pick up any new network interfaces
 	#
-	/etc/rc.d/ipfilter quietresync
-	/etc/rc.d/pf quietresync
+	if [ -f /etc/rc.d/ipfilter ]; then
+		/etc/rc.d/ipfilter quietresync
+	fi
+	if [ -f /etc/rc.d/pf ]; then
+		/etc/rc.d/pf quietresync
+	fi
 }
 
 ppp_stop_profile() {