dhcp: fix $PATH environment for dhclient-script

CLIENT_PATH is the only environment variable of dhclient-script,
change it to include major run path, [BUGFIX#132]

Signed-off-by: Qing He <qing.he@intel.com>

diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch b/meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch
new file mode 100644 (file)
index 0000000..f6a7be1
--- /dev/null
+++ b/meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch
@@ -0,0 +1,21 @@
+CLIENT_PATH is the only environment when executing dhclient-script,
+without this patch, dhclient-script won't run properly because it
+invokes ifconfig and route
+
+7/28/2010 - qhe
+
+diff -ru dhcp-4.1.1-P1.orig//client/Makefile.am dhcp-4.1.1-P1/client/Makefile.am
+--- dhcp-4.1.1-P1.orig//client/Makefile.am     2010-07-29 13:20:05.000000000 +0800
++++ dhcp-4.1.1-P1/client/Makefile.am   2010-07-29 13:28:14.000000000 +0800
+@@ -10,9 +10,9 @@
+ EXTRA_DIST = $(man_MANS)
+ 
+ dhclient.o: dhclient.c
+-      $(COMPILE) -DCLIENT_PATH='"$(sbindir)"' \
++      $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):$(base_sbindir):$(bindir):$(base_bindir)"' \
+                  -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c
+ 
+ dhc6.o: dhc6.c
+-      $(COMPILE) -DCLIENT_PATH='"$(sbindir)"' \
++      $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):$(base_sbindir):$(bindir):$(base_bindir)"' \
+                  -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c

diff --git a/meta/packages/dhcp/dhcp_4.1.1-P1.bb b/meta/packages/dhcp/dhcp_4.1.1-P1.bb
index c7025f850d796571360b6d5ba1ba4e6cd6576889..e9759de56f98cf53eea9f484ec1a84c3db5061de 100644 (file)
--- a/meta/packages/dhcp/dhcp_4.1.1-P1.bb
+++ b/meta/packages/dhcp/dhcp_4.1.1-P1.bb
@@ -1,6 +1,7 @@
 require dhcp4.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://fixincludes.patch \
-            file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0"
+            file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
+            file://fix-client-path.patch"