diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/ap/cgmanager/config | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/cgmanager/config')
-rw-r--r-- | source/ap/cgmanager/config/rc.cgmanager | 2 | ||||
-rw-r--r-- | source/ap/cgmanager/config/rc.cgproxy | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/ap/cgmanager/config/rc.cgmanager b/source/ap/cgmanager/config/rc.cgmanager index 83c190619..56f355d61 100644 --- a/source/ap/cgmanager/config/rc.cgmanager +++ b/source/ap/cgmanager/config/rc.cgmanager @@ -31,7 +31,7 @@ stop_cgmanager() { /bin/sh /etc/rc.d/rc.cgproxy stop >/dev/null 2>&1 || true echo "Stopping cgmanager." /bin/kill $(cat /run/cgmanager.pid 2>/dev/null) 2>/dev/null - /usr/bin/pkill cgmanager 2>/dev/null + /usr/bin/pkill --exact /usr/sbin/cgmanager 2>/dev/null rm -f /run/cgmanager.pid } diff --git a/source/ap/cgmanager/config/rc.cgproxy b/source/ap/cgmanager/config/rc.cgproxy index bd96902cb..59a61b78d 100644 --- a/source/ap/cgmanager/config/rc.cgproxy +++ b/source/ap/cgmanager/config/rc.cgproxy @@ -23,10 +23,10 @@ stop_cgproxy() { if ! /bin/kill $(cat /run/cgproxy.pid 2>/dev/null) 2>/dev/null ; then sleep 1 echo "Sending cgproxy the TERM signal." - if ! /usr/bin/pkill -TERM cgproxy ; then + if ! /usr/bin/pkill --exact -TERM /usr/sbin/cgproxy ; then sleep 5 echo "Sending cgproxy the KILL signal." - /usr/bin/pkill -KILL cgproxy + /usr/bin/pkill --exact -KILL /usr/sbin/cgproxy sleep 5 if ps -C cgproxy | grep -q cgproxy 2>/dev/null ; then echo "Error: couldn't stop cgproxy." |