* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/files/
@ 2017-06-06 21:06 Patrick McLean
0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2017-06-06 21:06 UTC (permalink / raw
To: gentoo-commits
commit: 8b6bb7a9815c28cec303a9fb7ab533ed916d3fa5
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 6 21:05:42 2017 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Jun 6 21:06:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6bb7a9
net-dns/dnsmasq: initd: Use retry rather than start_stop_daemon_args
This prevents messages on start about retry arg not being supported for start.
Gentoo-Bug: 619372
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-dns/dnsmasq/files/dnsmasq-init-r2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-r2 b/net-dns/dnsmasq/files/dnsmasq-init-r2
index acbd1477bc4..ed487b9fd1b 100644
--- a/net-dns/dnsmasq/files/dnsmasq-init-r2
+++ b/net-dns/dnsmasq/files/dnsmasq-init-r2
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
extra_started_commands="reload"
@@ -7,7 +7,7 @@ extra_started_commands="reload"
pidfile="/var/run/dnsmasq.pid"
command="/usr/sbin/dnsmasq"
command_args="-x ${pidfile} ${DNSMASQ_OPTS}"
-start_stop_daemon_args="--retry TERM/3/TERM/5"
+retry="TERM/3/TERM/5"
depend() {
provide dns
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/files/
@ 2017-06-07 22:02 Patrick McLean
0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2017-06-07 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 2bf9206ad8deee811a369b08c8d9f4d00422a02e
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 7 22:01:36 2017 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Jun 7 22:02:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf9206a
net-dns/dnsmasq: Update the DHCP version of the init script as well
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1 b/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1
index f520d9327a5..b62630f7140 100644
--- a/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1
+++ b/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
extra_started_commands="reload"
@@ -7,7 +7,7 @@ extra_started_commands="reload"
pidfile="/var/run/dnsmasq.pid"
command="/usr/sbin/dnsmasq"
command_args="-x ${pidfile} ${DNSMASQ_OPTS}"
-start_stop_daemon_args="--retry TERM/3/TERM/5"
+retry="TERM/3/TERM/5"
depend() {
provide dns
@@ -24,6 +24,6 @@ start_pre() {
reload() {
ebegin "Reloading ${RC_SVCNAME}"
- kill -HUP $(cat "${pidfile}")
+ kill -HUP "$(cat "${pidfile}")"
eend $?
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/files/
@ 2018-03-19 18:12 Patrick McLean
0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2018-03-19 18:12 UTC (permalink / raw
To: gentoo-commits
commit: de032307bbf24daff0ce88df038f3ce6d35a3957
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 18:11:24 2018 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 18:11:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de032307
net-dns/dnsmasq: Remove unused files (bug #650194)
Closes: https://bugs.gentoo.org/650194
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1 | 29 -----------------------------
net-dns/dnsmasq/files/dnsmasq-init-r2 | 23 -----------------------
2 files changed, 52 deletions(-)
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1 b/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1
deleted file mode 100644
index b62630f7140..00000000000
--- a/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-pidfile="/var/run/dnsmasq.pid"
-command="/usr/sbin/dnsmasq"
-command_args="-x ${pidfile} ${DNSMASQ_OPTS}"
-retry="TERM/3/TERM/5"
-
-depend() {
- provide dns
- need localmount net
- after bootmisc
- use logger
-}
-
-start_pre() {
- checkpath --owner dnsmasq:dnsmasq \
- --mode 0644 \
- --file /var/lib/misc/dnsmasq.leases
-}
-
-reload() {
- ebegin "Reloading ${RC_SVCNAME}"
- kill -HUP "$(cat "${pidfile}")"
- eend $?
-}
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-r2 b/net-dns/dnsmasq/files/dnsmasq-init-r2
deleted file mode 100644
index ed487b9fd1b..00000000000
--- a/net-dns/dnsmasq/files/dnsmasq-init-r2
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-pidfile="/var/run/dnsmasq.pid"
-command="/usr/sbin/dnsmasq"
-command_args="-x ${pidfile} ${DNSMASQ_OPTS}"
-retry="TERM/3/TERM/5"
-
-depend() {
- provide dns
- need localmount net
- after bootmisc
- use logger
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- kill -HUP $(cat "${pidfile}")
- eend $?
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/files/
@ 2018-03-22 20:55 Patrick McLean
0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2018-03-22 20:55 UTC (permalink / raw
To: gentoo-commits
commit: d1dee7f811e67c7f937646a851336c49f6ed2095
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 20:55:31 2018 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 20:55:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1dee7f8
net-dns/dnsmasq: Add "missingok" to logrotate script
Was pointed out by toralf.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-dns/dnsmasq/files/dnsmasq.logrotate | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-dns/dnsmasq/files/dnsmasq.logrotate b/net-dns/dnsmasq/files/dnsmasq.logrotate
index d689f8f875b..75372feef7b 100644
--- a/net-dns/dnsmasq/files/dnsmasq.logrotate
+++ b/net-dns/dnsmasq/files/dnsmasq.logrotate
@@ -1,6 +1,7 @@
/var/log/dnsmasq.log {
create 640 dnsmasq root
notifempty
+ missingok
postrotate
test -r /var/run/dnsmasq.pid && kill -USR2 "$(head -n1 /var/run/dnsmasq.pid)"
endscript
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/files/
@ 2019-03-04 3:14 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2019-03-04 3:14 UTC (permalink / raw
To: gentoo-commits
commit: b2e7c2b6c43a207c2d7ea9d664de818ccfa47120
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Mar 2 11:49:04 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 03:11:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e7c2b6
net-dns/dnsmasq: remove unused files
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11208
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-dns/dnsmasq/files/dnsmasq-init-dhcp-r2 | 29 -----------------------------
net-dns/dnsmasq/files/dnsmasq-init-r3 | 23 -----------------------
2 files changed, 52 deletions(-)
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r2 b/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r2
deleted file mode 100644
index 610ce7a5d2e..00000000000
--- a/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r2
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-pidfile="/var/run/dnsmasq.pid"
-command="/usr/sbin/dnsmasq"
-command_args="-x ${pidfile} ${DNSMASQ_OPTS}"
-retry="TERM/3/TERM/5"
-
-depend() {
- provide dns
- need localmount net
- after bootmisc
- use logger
-}
-
-start_pre() {
- checkpath --owner dnsmasq:dnsmasq \
- --mode 0644 \
- --file /var/lib/misc/dnsmasq.leases
-}
-
-reload() {
- ebegin "Reloading ${RC_SVCNAME}"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend $?
-}
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-r3 b/net-dns/dnsmasq/files/dnsmasq-init-r3
deleted file mode 100644
index 9d58b26fa5e..00000000000
--- a/net-dns/dnsmasq/files/dnsmasq-init-r3
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-pidfile="/var/run/dnsmasq.pid"
-command="/usr/sbin/dnsmasq"
-command_args="-x ${pidfile} ${DNSMASQ_OPTS}"
-retry="TERM/3/TERM/5"
-
-depend() {
- provide dns
- need localmount net
- after bootmisc
- use logger
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend $?
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-04 3:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-19 18:12 [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/files/ Patrick McLean
-- strict thread matches above, loose matches on Subject: below --
2019-03-04 3:14 Aaron Bauman
2018-03-22 20:55 Patrick McLean
2017-06-07 22:02 Patrick McLean
2017-06-06 21:06 Patrick McLean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox