summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-03-15 14:39:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:26 +0000
commit4653fdd4b4cf13543e32fbcf09e50f60c1719a34 (patch)
tree798d6ac769e366edb20ce7fb1306b1fcc1086f2f /meta
parente382d96c6bb04b30e59dbeeb30b4c6e0a549c8ba (diff)
downloadpoky-4653fdd4b4cf13543e32fbcf09e50f60c1719a34.tar.gz
dhcp: enable gentle shutdown
For now, `systemctl stop dhcpd' cannot stop dhcpd correctly, the SIGTERM signal would time out, causing a SIGKILL signal sent to dhcpd. Patch site.h to enable gentle shutdown to so that dhcpd could be stopped by SIGTERM. (From OE-Core rev: 2c789bac353e17637549a7b31706761ba848728e) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch25
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb1
2 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
new file mode 100644
index 0000000000..434421230a
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
@@ -0,0 +1,25 @@
1Upstream-Status: Inappropriate [configuration]
2
3Subject: [PATCH] site.h: enable gentle shutdown
4
5Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
6---
7 includes/site.h | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/includes/site.h b/includes/site.h
11index 73fa4e8..9c33de3 100644
12--- a/includes/site.h
13+++ b/includes/site.h
14@@ -280,7 +280,7 @@
15 situations. We plan to revisit this feature and may
16 make non-backwards compatible changes including the
17 removal of this define. Use at your own risk. */
18-/* #define ENABLE_GENTLE_SHUTDOWN */
19+#define ENABLE_GENTLE_SHUTDOWN
20
21 /* Include old error codes. This is provided in case you
22 are building an external program similar to omshell for
23--
241.9.1
25
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb
index ee1e082c84..970617ff92 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.3.bb
@@ -7,6 +7,7 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
7 file://dhclient-script-drop-resolv.conf.dhclient.patch \ 7 file://dhclient-script-drop-resolv.conf.dhclient.patch \
8 file://replace-ifconfig-route.patch \ 8 file://replace-ifconfig-route.patch \
9 file://CVE-2015-8605.patch \ 9 file://CVE-2015-8605.patch \
10 file://0001-site.h-enable-gentle-shutdown.patch \
10 " 11 "
11 12
12SRC_URI[md5sum] = "c5577b09c9017cdd319a11ff6364268e" 13SRC_URI[md5sum] = "c5577b09c9017cdd319a11ff6364268e"