From 5fba534b15baa3778bbce2952ac7664bcda4e73c Mon Sep 17 00:00:00 2001 From: Qing He Date: Thu, 29 Jul 2010 13:39:28 +0800 Subject: 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 --- .../dhcp/dhcp-4.1.1-P1/fix-client-path.patch | 21 +++++++++++++++++++++ meta/packages/dhcp/dhcp_4.1.1-P1.bb | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch 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 index 000000000..f6a7be1d8 --- /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 c7025f850..e9759de56 100644 --- 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" -- cgit v1.2.3