diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-04-25 19:00:34 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-04-26 08:59:56 +0200 |
| commit | 1e4e21c5047511d3bf04e4e475803e9bbe29b11a (patch) | |
| tree | 87cccf3b5633db488e9e2d23a433292ed2c0e0e8 /source/n | |
| parent | 7b610e99b43e1de0f1614d113ada49ba2ff8f607 (diff) | |
| download | current-1e4e21c5047511d3bf04e4e475803e9bbe29b11a.tar.gz | |
Sun Apr 25 19:00:34 UTC 202120210425190034
d/gdb-10.2-x86_64-1.txz: Upgraded.
d/python-pip-21.1-x86_64-1.txz: Upgraded.
n/dnsmasq-2.85-x86_64-2.txz: Rebuilt.
rc.dnsmasq: display stop message. Thanks to vineetmehta.
rc.dnsmasq: kill by .pid file (or at least within the current namespace).
Thanks to Petri Kaukasoina.
n/wireguard-tools-1.0.20210424-x86_64-1.txz: Upgraded.
x/fcitx-qt5-1.2.6-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n')
| -rwxr-xr-x | source/n/dnsmasq/dnsmasq.SlackBuild | 2 | ||||
| -rw-r--r-- | source/n/dnsmasq/doinst.sh | 3 | ||||
| -rw-r--r-- | source/n/dnsmasq/rc.dnsmasq | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild index 29a79927..329ca627 100755 --- a/source/n/dnsmasq/dnsmasq.SlackBuild +++ b/source/n/dnsmasq/dnsmasq.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dnsmasq VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} EXTRA_BUILD_OPTS=${EXTRA_BUILD_OPTS:-"-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"} diff --git a/source/n/dnsmasq/doinst.sh b/source/n/dnsmasq/doinst.sh index 9aadc3e5..92914eb3 100644 --- a/source/n/dnsmasq/doinst.sh +++ b/source/n/dnsmasq/doinst.sh @@ -21,6 +21,3 @@ preserve_perms() { } config etc/dnsmasq.conf.new preserve_perms etc/rc.d/rc.dnsmasq.new - -# This should be mostly useless... -rm -f etc/rc.d/rc.dnsmasq.new diff --git a/source/n/dnsmasq/rc.dnsmasq b/source/n/dnsmasq/rc.dnsmasq index ce584cbd..f19a1723 100644 --- a/source/n/dnsmasq/rc.dnsmasq +++ b/source/n/dnsmasq/rc.dnsmasq @@ -11,7 +11,14 @@ dnsmasq_start() { # Stop dnsmasq: dnsmasq_stop() { - killall dnsmasq + # Try to use the .pid file first: + if pgrep -l -F /var/run/dnsmasq.pid 2> /dev/null | grep -q dnsmasq ; then + echo "Stopping dnsmasq." + pkill -F /var/run/dnsmasq.pid 2> /dev/null + else # kill any dnsmasq processes in this namespace: + echo "Stopping dnsmasq." + killall --ns $$ dnsmasq 2> /dev/null + fi } # Restart dnsmasq: |