diff mbox

[4/4] sysv init scripts: use symbolic names in trap command

Message ID 1414345306-27184-4-git-send-email-dywi@mailerd.de
State Accepted
Headers show

Commit Message

André Erdmann Oct. 26, 2014, 5:41 p.m. UTC
Not really necessary(*), but checkbashisms complains about
"trap with signal numbers".

(*) Quoting man 1p trap:
   trap [action condition...]
   [...]
   The condition can be EXIT, 0 (equivalent to EXIT),
   or a signal specified using a symbolic name, without the SIG prefix
   [...]
   XSI-conformant systems also allow numeric signal numbers[...]

Only one file is affected by this commit, and it should be checked
whether it really needs to ignore SIGTERM/SIGHUP or if the trap commands
can simply be removed:

 package/proftpd/S50proftpd

Signed-off-by: André Erdmann <dywi@mailerd.de>
---
 package/proftpd/S50proftpd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni Oct. 26, 2014, 5:53 p.m. UTC | #1
Dear André Erdmann,

On Sun, 26 Oct 2014 18:41:46 +0100, André Erdmann wrote:
> Not really necessary(*), but checkbashisms complains about
> "trap with signal numbers".
> 
> (*) Quoting man 1p trap:
>    trap [action condition...]
>    [...]
>    The condition can be EXIT, 0 (equivalent to EXIT),
>    or a signal specified using a symbolic name, without the SIG prefix
>    [...]
>    XSI-conformant systems also allow numeric signal numbers[...]
> 
> Only one file is affected by this commit, and it should be checked
> whether it really needs to ignore SIGTERM/SIGHUP or if the trap commands
> can simply be removed:
> 
>  package/proftpd/S50proftpd
> 
> Signed-off-by: André Erdmann <dywi@mailerd.de>
> ---
>  package/proftpd/S50proftpd | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

Thomas
diff mbox

Patch

diff --git a/package/proftpd/S50proftpd b/package/proftpd/S50proftpd
index 550e0a6..dd6cad2 100755
--- a/package/proftpd/S50proftpd
+++ b/package/proftpd/S50proftpd
@@ -1,8 +1,8 @@ 
-#!/bin/sh 
+#!/bin/sh
 
 DAEMON=/usr/sbin/proftpd
-trap "" 1
-trap "" 15
+trap "" HUP
+trap "" TERM
 test -f $DAEMON || exit 0
 [ ! -d /var/run/proftpd ] && mkdir /var/run/proftpd
 [ ! -f /var/log/wtmp ] && touch /var/log/wtmp