Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 246017 Details for
Bug 262097
sys-apps/baselayout-1.x dhcpcd module passes incorrect option to dhcpcd for nodns when compat use flag is off
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated patch with test results
dhcpcd_backport.patch (text/plain), 2.45 KB, created by
Mike Pagano
on 2010-09-04 17:58:14 UTC
(
hide
)
Description:
Updated patch with test results
Filename:
MIME Type:
Creator:
Mike Pagano
Created:
2010-09-04 17:58:14 UTC
Size:
2.45 KB
patch
obsolete
>--- dhcpcd.sh.orig 2010-09-04 12:19:04.091963895 -0400 >+++ dhcpcd.sh 2010-09-04 13:54:07.688789732 -0400 >@@ -60,42 +60,67 @@ dhcpcd_stop() { > # > # Returns 0 (true) when a DHCP address is obtained, otherwise 1 > dhcpcd_start() { >- local iface="$1" opts= pidfile="/var/run/dhcpcd-$1.pid" >+ local iface="$1" new= args= pidfile="/var/run/dhcpcd-$1.pid" > local ifvar=$(bash_variable "${iface}") metric= d= > > interface_exists "${iface}" true || return 1 > >+ eval args=\$dhcpcd_${IFVAR} >+ [ -z "${args}" ] && args=${dhcpcd} >+ > # Get our options >- opts="dhcpcd_${ifvar}" >- opts="${dhcpcd} ${!opts}" >+ eval opts=\$dhcp_${IFVAR} >+ [ -z "${opts}" ] && opts=${dhcp} >+ >+ case "$(dhcpcd --version)" in >+ "dhcpcd "[123]*) new=false;; >+ *) new=true;; >+ esac > > # Map some generic options to dhcpcd >- d="dhcp_${ifvar}" >- d=" ${!d} " >- [[ ${d} == " " ]] && d=" ${dhcp} " >- [[ ${d} == *" nodns "* ]] && opts="${opts} -R" >- [[ ${d} == *" nontp "* ]] && opts="${opts} -N" >- [[ ${d} == *" nonis "* ]] && opts="${opts} -Y" >- [[ ${d} == *" nogateway "* ]] && opts="${opts} -G" >- if [[ ${d} == *" nosendhost "* ]] ; then >- opts="${opts} -h ''" >- else >- # We transmit the hostname by default >- if [[ " ${opts} " != *" -h "* ]]; then >- local hname=$(hostname) >- [[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \ >- && opts="-h \"${hname}\" ${opts}" >- fi >+ for opt in ${opts}; do >+ case "${opt}" in >+ nodns) >+ if ${new}; then >+ args="${args} -C resolv.conf" >+ else >+ args="${args} -R" >+ fi >+ ;; >+ nontp) >+ if ${new}; then >+ args="${args} -C ntp.conf" >+ else >+ args="${args} -N" >+ fi >+ ;; >+ nonis) >+ if ${new}; then >+ args="${args} -C yp.conf" >+ else >+ args="${args} -Y" >+ fi >+ ;; >+ nogateway) args="${args} -G";; >+ nosendhost) args="${args} -h ''"; >+ esac >+ done >+ >+ # We transmit the hostname by default >+ if [[ " ${args} " != *" -h "* ]]; then >+ local hname=$(hostname) >+ [[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \ >+ && args="-h \"${hname}\" ${args}" > fi > > # Add our route metric > metric="metric_${ifvar}" >- [[ -n ${!metric} && ${!metric} != "0" ]] && opts="${opts} -m ${!metric}" >+ [[ -n ${!metric} && ${!metric} != "0" ]] && args="${args} -m ${!metric}" > > # Bring up DHCP for this interface (or alias) > ebegin "Running dhcpcd" > >- eval /sbin/dhcpcd "${opts}" "${iface}" >+ eval /sbin/dhcpcd "${args}" "${iface}" > eend $? || return 1 > > # DHCP succeeded, show address retrieved
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 262097
:
243553
|
245173
|
245211
|
245234
|
245401
|
245967
|
246017
|
246357
|
247756