From 6401ae209fb075981ace2c746f68794a59853cb1 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Wed, 20 Aug 2014 15:10:15 -0400 Subject: 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 --- recipes-connectivity/dhcp/dhcp_4.3.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-connectivity/dhcp') diff --git a/recipes-connectivity/dhcp/dhcp_4.3.bbappend b/recipes-connectivity/dhcp/dhcp_4.3.bbappend index f5fb44a..a23f7c9 100644 --- a/recipes-connectivity/dhcp/dhcp_4.3.bbappend +++ b/recipes-connectivity/dhcp/dhcp_4.3.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 } -- cgit v1.2.3-13-gbd6f