diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2012-10-08 12:47:23 +0200 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2012-10-08 12:48:22 +0200 |
| commit | e182e58e886c6e5cb105055b76646113f2c3bc2d (patch) | |
| tree | caeed2d3c67dd118bc78f4d8e34f7364e1dda552 /rc.d | |
| parent | 30483d5b4a4763e03dcc2462a4621b76568ab1b3 (diff) | |
| download | initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.tar initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.tar.gz initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.tar.bz2 initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.tar.xz initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.zip | |
Revert patches which should not be in 6.4
Revert "Process rule6-* for sit devices (#840009)"
This reverts commit f082f9e64eadbf68ef9bb67744c97c0974af9115.
Revert "securetty: check if the device is in the file before attempting to write to it"
This reverts commit 10c72ce532c1d4f6d0b17fdc9448c9bd2d0b5ef5.
Revert "Killproc -d should parse same values as sleep"
This reverts commit 763b7dcf6bf9e47d90546be1aabf1f724dd527f8.
Revert "Make killproc more granular when delay is passed. (#428029, <xjakub@fi.muni.cz>)"
This reverts commit 6e62c51f3162081cc05ef546929aa98b8448b1cb.
Revert "Allow dhclient configuration files for DHCPv6 as well. (#815676)"
This reverts commit 9987361e94ec6f26e557053b27af6e43a9ee13e1.
Diffstat (limited to 'rc.d')
| -rw-r--r-- | rc.d/init.d/functions | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index ce6df4c7..f1fff775 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -269,9 +269,9 @@ daemon() { # A function to stop a program. killproc() { - local RC killlevel= base pid pid_file= delay try + local RC killlevel= base pid pid_file= delay - RC=0; delay=3; try=0 + RC=0; delay=3 # Test syntax. if [ "$#" -eq 0 ]; then echo $"Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]" @@ -282,11 +282,7 @@ killproc() { shift 2 fi if [ "$1" = "-d" ]; then - delay=$(echo $2 | awk -v RS=' ' -v IGNORECASE=1 '{if($1!~/^[0-9.]+[smhd]?$/) exit 1;d=$1~/s$|^[0-9.]*$/?1:$1~/m$/?60:$1~/h$/?60*60:$1~/d$/?24*60*60:-1;if(d==-1) exit 1;delay+=d*$1} END {printf("%d",delay+0.5)}') - if [ "$?" -eq 1 ]; then - echo $"Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]" - return 1 - fi + delay=$2 shift 2 fi @@ -316,17 +312,11 @@ killproc() { # TERM first, then KILL if not dead kill -TERM $pid >/dev/null 2>&1 usleep 100000 - if checkpid $pid ; then - try=0 - while [ $try -lt $delay ] ; do - checkpid $pid || break - sleep 1 - let try+=1 - done - if checkpid $pid ; then - kill -KILL $pid >/dev/null 2>&1 - usleep 100000 - fi + if checkpid $pid && sleep 1 && + checkpid $pid && sleep $delay && + checkpid $pid ; then + kill -KILL $pid >/dev/null 2>&1 + usleep 100000 fi fi checkpid $pid |