diff options
| author |   Mark Asselstine <mark.asselstine@windriver.com> | 2014-08-20 15:10:15 -0400 |
|---|---|---|
| committer |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-08-27 10:09:04 -0400 |
| commit | 036805a066a7398b3b5142f7a157189f03dfddcf (patch) | |
| tree | 8025645e3c2c4a866ef7ad10f16c5119efb5ef55 | |
| parent | 0f225491c7e34a52b1e65b6af2482c9f16472cac (diff) | |
| download | meta-cloud-services-036805a066a7398b3b5142f7a157189f03dfddcf.tar.gz meta-cloud-services-036805a066a7398b3b5142f7a157189f03dfddcf.tar.bz2 meta-cloud-services-036805a066a7398b3b5142f7a157189f03dfddcf.zip | |
dhcp: fix double 'request' in dhclient.conf
commit 43e2b093040734d4c4b28db96a634cd2a5f3271b [dhcp: add dhcp
classless static route support] had a flaw in one of
do_install_append() sed expressions in the dhcp recipe that caused a
duplicate 'request' keyword to be inserted in to the dhclient.conf
file. The result was that results returned for the request were not as
expected and the resolv.conf would be empty. Fixing up the sed
expression removes the duplicate and allows things to function
properly.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
| -rw-r--r-- | recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend b/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend index f5fb44ad..a23f7c90 100644 --- a/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend +++ b/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend @@ -7,7 +7,7 @@ do_install_append () { install -m 0644 ${WORKDIR}/dhclient-exit-hooks ${D}${sysconfdir}/dhcp/dhclient-exit-hooks sed 's%/etc/dhclient-exit-hooks%/etc/dhcp/dhclient-exit-hooks%g' -i ${D}${base_sbindir}/dhclient-script - sed 's%request .*%\noption classless-static-routes code 121 = array of unsigned integer 8;\n\nrequest &%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf + sed 's%request .*%\noption classless-static-routes code 121 = array of unsigned integer 8;\n\n&%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf sed 's%netbios-name-servers,.*netbios-scope;%netbios-name-servers, netbios-scope, classless-static-routes;\n%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf } |