From owner-svn-src-all@FreeBSD.ORG  Thu Nov 15 15:48:41 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F0C222E0;
 Thu, 15 Nov 2012 15:48:40 +0000 (UTC)
 (envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D38008FC08;
 Thu, 15 Nov 2012 15:48:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFFmem9010636;
 Thu, 15 Nov 2012 15:48:40 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFFme2Z010635;
 Thu, 15 Nov 2012 15:48:40 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <201211151548.qAFFme2Z010635@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 15 Nov 2012 15:48:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243086 - stable/9/etc
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 15:48:41 -0000

Author: n_hibma
Date: Thu Nov 15 15:48:40 2012
New Revision: 243086
URL: http://svnweb.freebsd.org/changeset/base/243086

Log:
  MFC r242784:
    Not only load pccard_ether settings, also load network settings. This
    is only a problem when a /etc/rc.conf.d/network file is being used.
  
    PR:		conf/160373
    Submitted by:	n_hibma

Modified:
  stable/9/etc/pccard_ether
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/pccard_ether
==============================================================================
--- stable/9/etc/pccard_ether	Thu Nov 15 15:21:58 2012	(r243085)
+++ stable/9/etc/pccard_ether	Thu Nov 15 15:48:40 2012	(r243086)
@@ -123,4 +123,5 @@ else
 fi
 
 load_rc_config pccard_ether
+load_rc_config network
 run_rc_command $args