Date: Fri, 18 Aug 2006 17:30:34 GMT From: Michael Bushkov <bushman@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 104502 for review Message-ID: <200608181730.k7IHUY8v023872@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=104502 Change 104502 by bushman@bushman_nss_ldap_cached on 2006/08/18 17:30:10 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile#3 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.293 2006/08/17 17:12:26 brian Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.294 2006/08/17 20:13:24 brian Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -93,9 +93,10 @@ hostname="" # Set this! nisdomainname="NO" # Set to NIS domain if using NIS (or NO). dhclient_program="/sbin/dhclient" # Path to dhcp client program. -dhclient_flags="" # Additional flags to pass to dhcp client. -dhclient_flags_fxp0="" # Additional dhclient flags for fxp0 only +dhclient_flags="" # Extra flags to pass to dhcp client. +dhclient_flags_fxp0="" # Extra dhclient flags for fxp0 only background_dhclient="NO" # Start dhcp client in the background. +background_dhclient_fxp0="" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. firewall_enable="NO" # Set to YES to enable firewall functionality ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.23 2006/08/17 17:12:26 brian Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.24 2006/08/17 19:57:10 brian Exp $ # # PROVIDE: dhclient @@ -34,7 +34,7 @@ fi eval specific=\$background_dhclient_$ifn - if [ -n "$specific ]; then + if [ -n "$specific" ]; then if checkyesno background_dhclient_$ifn; then rc_flags="${rc_flags} -b" fi ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile#3 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608181730.k7IHUY8v023872>