From owner-svn-src-head@freebsd.org  Wed Apr  5 05:23:10 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 A08E9D2F9BC;
 Wed,  5 Apr 2017 05:23:10 +0000 (UTC) (envelope-from cy@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 7122BC53;
 Wed,  5 Apr 2017 05:23:10 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v355N9Pi082809;
 Wed, 5 Apr 2017 05:23:09 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v355N9km082808;
 Wed, 5 Apr 2017 05:23:09 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201704050523.v355N9km082808@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 5 Apr 2017 05:23:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316516 - head/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Apr 2017 05:23:10 -0000

Author: cy
Date: Wed Apr  5 05:23:09 2017
New Revision: 316516
URL: https://svnweb.freebsd.org/changeset/base/316516

Log:
  r316487 altered the defined values of rc_force from "yes" (for yes)
  and NULL (for no) to "no" (for no) and no change to the definition
  of yes. Two rc.d scripts, dhclient and bgfsck check rc_force for
  yesi, using test -n, and no, using test -z. The redefinition of
  yes and no by r316487 caused rc.d/dhclient, when invoked by devd
  using a devd.conf rule, to assign DHCP assigned IP addresses for
  interfaces with statically assigned interfaces, breaking boot.
  Point of breakage was at line 25 of etc/rc.d/dhclient (r301068)
  where $rc_force needs to be NULL.
  
  MFC after:	3 weeks
  X-MFC with:	r316487

Modified:
  head/etc/rc.subr

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Wed Apr  5 05:01:23 2017	(r316515)
+++ head/etc/rc.subr	Wed Apr  5 05:23:09 2017	(r316516)
@@ -929,6 +929,9 @@ run_rc_command()
 			eval ${rcvar}=YES
 		fi
 	fi
+	if ! checkyesno rc_force; then
+		rc_force=
+	fi
 	debug "_rc_prefix=${_rc_prefix}"
 
 	eval _override_command=\$${name}_program