From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2b1ff41196a0b9ac6794904427416eb05506f13d
Date: Mon, 02 Sep 2013 19:11:55 +0200 [thread overview]
Message-ID: <20130902171156.05ECD20887@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 2b1ff41196a0b9ac6794904427416eb05506f13d (commit)
from 2340d265b1a21f036a04d2ad9649bd7637eeda71 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2b1ff41196a0b9ac6794904427416eb05506f13d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 2 19:11:40 2013 +0200
dnsmasq: Fix appending arguments to the argument list.
-----------------------------------------------------------------------
Summary of changes:
src/initscripts/init.d/dnsmasq | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 15db47c..34eee0c 100644
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -51,7 +51,7 @@ case "${1}" in
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
ARGS="$CUSTOM_ARGS"
- [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
+ [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN"
echo > /var/ipfire/red/resolv.conf # Clear it
if [ -e "/var/ipfire/red/dns1" ]; then
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-09-02 17:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130902171156.05ECD20887@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox