dhcp: enable gentle shutdown
cover dhcp: enable gentle shutdown
The following changes since commit 6f98c39418c60b7c0b25b30983d2e5257158a6a4:
gcc: Drop 4.8 (2015-11-16 14:59:07 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/dhcp-gentle-shutdown
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/dhcp-gentle-shutdown
Chen Qi (1):
dhcp: enable gentle shutdown
.../dhcp/0001-site.h-enable-gentle-shutdown.patch | 25 ++++++++++++++++++++++ meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
Signature · 1 line
1.9.1
PATCH 1/1 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.
--- .../dhcp/0001-site.h-enable-gentle-shutdown.patch | 25 ++++++++++++++++++++++ meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch new file +25 -0
@@ -0,0 +1,25 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH] site.h: enable gentle shutdown + +Signed-off-by: Chen Qi <[email protected]> +--- + includes/site.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/includes/site.h b/includes/site.h +index 73fa4e8..9c33de3 100644 +--- a/includes/site.h ++++ b/includes/site.h +@@ -280,7 +280,7 @@ + situations. We plan to revisit this feature and may + make non-backwards compatible changes including the + removal of this define. Use at your own risk. */ +-/* #define ENABLE_GENTLE_SHUTDOWN */ ++#define ENABLE_GENTLE_SHUTDOWN + + /* Include old error codes. This is provided in case you + are building an external program similar to omshell for +-- +1.9.1 +
meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb +1 -0
@@ -6,6 +6,7 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ file://fixsepbuild.patch \ file://dhclient-script-drop-resolv.conf.dhclient.patch \ file://replace-ifconfig-route.patch \ + file://0001-site.h-enable-gentle-shutdown.patch \ " SRC_URI[md5sum] = "5a284875dd2c12ddd388416d69156a67"
Signature · 1 line
1.9.1
Quoted 28 lines · Chen Qi
For now, `systemctl stop dhcpd' cannot stop dhcpd correctly, the SIGTERM signal would time out, causing a SIGKILL signal sent to dhcpd.
Patch
site.hto enable gentle shutdown to so that dhcpd could be stopped by SIGTERM.Signed-off-by Chen Qi <[email protected]>--- .../dhcp/0001-site.h-enable-gentle-shutdown.patch | 25 ++++++++++++++++++++++ meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb | 1 + 2 files changed, 26 insertions(+)create mode 100644
meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patchmeta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch new file +9
-0@@ -0,0 +1,25 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH] site.h: enable gentle shutdown + +Signed-off-by: Chen Qi <[email protected]> +--- + includes/site.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +
meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch line 19
Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch new file +10
-0+diff --git a/includes/site.h b/includes/site.h +index 73fa4e8..9c33de3 100644 +--- a/includes/site.h ++++ b/includes/site.h +@@ -280,7 +280,7 @@ + situations. We plan to revisit this feature and may + make non-backwards compatible changes including the + removal of this define. Use at your own risk. */ +-/* #define ENABLE_GENTLE_SHUTDOWN */ ++#define ENABLE_GENTLE_SHUTDOWN
how about to pass the macro in TARGET_CFLAGS
TARGET_CFLAGS += "-DENABLE_GENTLE_SHUTDOWN"
-Roy
Quoted 19 lines
meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch new file +6
-0+ + /* Include old error codes. This is provided in case you + are building an external program similar to omshell for +-- +1.9.1 +meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb +1
-0@@ -6,6 +6,7 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ file://fixsepbuild.patch \ file://dhclient-script-drop-resolv.conf.dhclient.patch \ file://replace-ifconfig-route.patch \ + file://0001-site.h-enable-gentle-shutdown.patch \ " SRC_URI[md5sum] = "5a284875dd2c12ddd388416d69156a67"
Signature · 2 lines
Best Reagrds, Roy | RongQing Li
Quoted 48 lines · Rongqing Li
Quoted 32 lines · Chen Qi
For now, `systemctl stop dhcpd' cannot stop dhcpd correctly, the SIGTERM signal would time out, causing a SIGKILL signal sent to dhcpd.
Patch
site.hto enable gentle shutdown to so that dhcpd could be stopped by SIGTERM.Signed-off-by Chen Qi <[email protected]>--- .../dhcp/0001-site.h-enable-gentle-shutdown.patch | 25 ++++++++++++++++++++++ meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb | 1 + 2 files changed, 26 insertions(+)create mode 100644
meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patchmeta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch +0
-0new file mode 100644
index 0000000..4344212
---/dev/null
+++b/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patchmeta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch +9
-0@@ -0,0 +1,25 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH] site.h: enable gentle shutdown + +Signed-off-by: Chen Qi <[email protected]> +--- + includes/site.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch line 19
Quoted 10 lines
meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch +10
-0+diff --git a/includes/site.h b/includes/site.h +index 73fa4e8..9c33de3 100644 +--- a/includes/site.h ++++ b/includes/site.h +@@ -280,7 +280,7 @@ + situations. We plan to revisit this feature and may + make non-backwards compatible changes including the + removal of this define. Use at your own risk. */ +-/* #define ENABLE_GENTLE_SHUTDOWN */ ++#define ENABLE_GENTLE_SHUTDOWNhow about to pass the macro in
TARGET_CFLAGS
Quoted 5 lines
TARGET_CFLAGS+= "-DENABLE_GENTLE_SHUTDOWN"-Roy
site.h file starts with the following statements:
"""
/* Site-specific definitions.
For supported systems, you shouldn't need to make any changes here. However, you may want to, in order to deal with site-specific differences. */
"""
And there's already a patch in dhcp to modify site.h for our specific configuration.
define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
So I think we need to keep the configuration in site.h.
Regards,
Chen Qi
Quoted 21 lines
Quoted 20 lines
meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch +6
-0+ + /* Include old error codes. This is provided in case you + are building an external program similar to omshell for +-- +1.9.1 +meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb +1
-0@@ -6,6 +6,7 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ file://fixsepbuild.patch \ file://dhclient-script-drop-resolv.conf.dhclient.patch \ file://replace-ifconfig-route.patch \ + file://0001-site.h-enable-gentle-shutdown.patch \ "SRC_URI[md5sum] = "
5a284875dd2c12ddd388416d69156a67"