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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
