mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-04 06:54:27 -05:00 
			
		
		
		
	ltq-vdsl-app: shutdown upon sigterm
procd sends sigterm to stop daemons, hook it up. This speeds up the shutdown sequence and gets rid of the following message: daemon.info procd: Instance dsl_control::instance1 pid 15408 not stopped on SIGTERM, sending SIGKILL instead Signed-off-by: Andre Heider <a.heider@gmail.com> Tested-by: Martin Schiller <ms@dev.tdt.de>
This commit is contained in:
		
							parent
							
								
									f5f01bcacd
								
							
						
					
					
						commit
						4ba6fad7f7
					
				@ -307,8 +307,6 @@ start_service() {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
stop_service() {
 | 
					stop_service() {
 | 
				
			||||||
	# do not use dsl_cmd to not block when this is locked up by some other proess
 | 
					 | 
				
			||||||
	echo quit > /tmp/pipe/dsl_cpe0_cmd
 | 
					 | 
				
			||||||
	DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
 | 
						DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
 | 
				
			||||||
	DSL_INTERFACE_STATUS="DOWN" \
 | 
						DSL_INTERFACE_STATUS="DOWN" \
 | 
				
			||||||
		/sbin/dsl_notify.sh
 | 
							/sbin/dsl_notify.sh
 | 
				
			||||||
 | 
				
			|||||||
@ -0,0 +1,19 @@
 | 
				
			|||||||
 | 
					--- a/src/dsl_cpe_control.c
 | 
				
			||||||
 | 
					+++ b/src/dsl_cpe_control.c
 | 
				
			||||||
 | 
					@@ -6504,7 +6504,7 @@ DSL_CPE_STATIC  void DSL_CPE_Termination
 | 
				
			||||||
 | 
					    /* ignore the signal, we'll handle by ourself */
 | 
				
			||||||
 | 
					    signal (sig, SIG_IGN);
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					-   if (sig == SIGINT)
 | 
				
			||||||
 | 
					+   if (sig == SIGINT || sig == SIGTERM)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					       DSL_CCA_DEBUG(DSL_CCA_DBG_MSG, (DSL_CPE_PREFIX "terminated" DSL_CPE_CRLF));
 | 
				
			||||||
 | 
					       DSL_CPE_Termination ();
 | 
				
			||||||
 | 
					@@ -6756,6 +6756,7 @@ DSL_int_t dsl_cpe_daemon (
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 #ifndef RTEMS
 | 
				
			||||||
 | 
					    signal (SIGINT, DSL_CPE_TerminationHandler);
 | 
				
			||||||
 | 
					+   signal (SIGTERM, DSL_CPE_TerminationHandler);
 | 
				
			||||||
 | 
					 #endif /* RTEMS*/
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					    /* Open DSL_CPE_MAX_DSL_ENTITIES devices*/
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user