From: Ryan Coe <bluemrp9@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 1/3] inadyn: do not install default conf file
Date: Mon, 17 Oct 2016 07:25:22 -0700 [thread overview]
Message-ID: <20161017142524.12026-1-bluemrp9@gmail.com> (raw)
The default conf file is not usable without modification. It is also not
compatible with the newer 2.0 series. Therefore, we will simply remove the
file. We also modify the startup script to silently exit if the conf file
is not found.
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
---
package/inadyn/S70inadyn | 4 ++--
package/inadyn/inadyn.conf | 11 -----------
package/inadyn/inadyn.mk | 6 ------
package/inadyn/inadyn.service | 2 +-
4 files changed, 3 insertions(+), 20 deletions(-)
delete mode 100644 package/inadyn/inadyn.conf
diff --git a/package/inadyn/S70inadyn b/package/inadyn/S70inadyn
index ca7b414..a66c3bd 100644
--- a/package/inadyn/S70inadyn
+++ b/package/inadyn/S70inadyn
@@ -5,8 +5,8 @@
CONFIG=/etc/inadyn.conf
-# check if CONFIG exists, print message & exit if it doesn't
-[ ! -f $CONFIG ] && ( echo "The config file "$CONFIG" is missing...exiting now." && exit 2 )
+# check if CONFIG exists, exit silently if it does not
+[ ! -f $CONFIG ] && exit 1
# Allow a few customizations from a config file. Especially inadyn
# must be explicitly enabled by adding ENABLED="yes" in this file.
diff --git a/package/inadyn/inadyn.conf b/package/inadyn/inadyn.conf
deleted file mode 100644
index ab8aa36..0000000
--- a/package/inadyn/inadyn.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Basic configuration file for inadyn
-#
-# /etc/inadyn.conf
-pidfile /var/run/inadyn.pid
-update_period_sec 600 # Check for a new IP every 600 seconds
-username test # replace 'test' with your username
-password test # replace 'test' with your password
-dyndns_system default at dyndns.org # replace w/ your provider
-
-alias test.homeip.net
-# replace 'test.homeip.net' with yourdomainname for actual (non-test) use
diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index 8ceca4c..cf071da 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -19,12 +19,6 @@ else
INADYN_CONF_OPTS += --disable-ssl
endif
-define INADYN_INSTALL_SAMPLE_CONFIG
- $(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \
- $(TARGET_DIR)/etc/inadyn.conf
-endef
-INADYN_POST_INSTALL_TARGET_HOOKS += INADYN_INSTALL_SAMPLE_CONFIG
-
define INADYN_INSTALL_INIT_SYSV
$(INSTALL) -D -m 0755 package/inadyn/S70inadyn \
$(TARGET_DIR)/etc/init.d/S70inadyn
diff --git a/package/inadyn/inadyn.service b/package/inadyn/inadyn.service
index abc0a1e..199ad62 100644
--- a/package/inadyn/inadyn.service
+++ b/package/inadyn/inadyn.service
@@ -3,7 +3,7 @@ Description=DDNS client
After=syslog.target network.target
[Service]
-ExecStart=/usr/bin/inadyn
+ExecStart=test -f /etc/inadyn.conf && /usr/bin/inadyn
Restart=always
[Install]
--
2.9.3
next reply other threads:[~2016-10-17 14:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-17 14:25 Ryan Coe [this message]
2016-10-17 14:25 ` [Buildroot] [PATCH v2 2/3] inadyn: bump to version 2.0 Ryan Coe
2016-10-17 14:25 ` [Buildroot] [PATCH v2 3/3] DEVELOPERS: add entry for inadyn Ryan Coe
2016-10-17 15:41 ` [Buildroot] [PATCH v2 1/3] inadyn: do not install default conf file Thomas Petazzoni
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=20161017142524.12026-1-bluemrp9@gmail.com \
--to=bluemrp9@gmail.com \
--cc=buildroot@busybox.net \
/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