From owner-svn-src-all@FreeBSD.ORG Tue Feb 10 13:07:09 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9FB57E10; Tue, 10 Feb 2015 13:07:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 8B142AE2; Tue, 10 Feb 2015 13:07:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AD79KS090254; Tue, 10 Feb 2015 13:07:09 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AD79k8090253; Tue, 10 Feb 2015 13:07:09 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201502101307.t1AD79k8090253@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: Roger Pau Monné Date: Tue, 10 Feb 2015 13:07:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278506 - head/etc/rc.d X-SVN-Group: head 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.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Feb 2015 13:07:09 -0000 Author: royger Date: Tue Feb 10 13:07:08 2015 New Revision: 278506 URL: https://svnweb.freebsd.org/changeset/base/278506 Log: rc.d: load the network config file for netif r272959 broke compatibility with mfsBSD that stores the default network config file in /etc/rc.conf.d/network. In order to fix that load the network config file from netif also. Modified: head/etc/rc.d/netif Modified: head/etc/rc.d/netif ============================================================================== --- head/etc/rc.d/netif Tue Feb 10 12:38:39 2015 (r278505) +++ head/etc/rc.d/netif Tue Feb 10 13:07:08 2015 (r278506) @@ -252,5 +252,8 @@ netif_common() debug "The following interfaces were not configured: $_fail" } +# Load the old "network" config file also for compatibility. +# This is needed for mfsBSD at least. +load_rc_config network load_rc_config $name run_rc_command $*