add sysconfig

diff --git a/ddclient.init b/ddclient.init
index 7018c43c5bc2d3c91657a6b107076d1f4bfe969a..8ba3ac61947ba9f1e10494add131003b5be1714a 100755 (executable)
--- a/ddclient.init
+++ b/ddclient.init
@@ -14,6 +14,7 @@
 . /etc/sysconfig/network
 
 # Get service config
+DDCLIENT_OPTIONS="-daemon 300"
 [ -f /etc/sysconfig/ddclient ] && . /etc/sysconfig/ddclient
 
 # Check that networking is up.
@@ -34,8 +35,7 @@ start() {
        fi
 
        msg_starting "Dynamic DNS Client"
-       interval=$(awk -F= '{gsub(/[ \t]*#.*/, "")} $1 == "daemon" {print $2}' /etc/ddclient/ddclient.conf)
-       daemon /usr/sbin/ddclient -daemon ${interval:-300}
+       daemon /usr/sbin/ddclient $DDCLIENT_OPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ddclient
 }

diff --git a/ddclient.spec b/ddclient.spec
index b0e9a6af1cd9c0f60dbbffa63b81b53f879647fb..e5eb319163a49687810ecae8732e0207b451260d 100644 (file)
--- a/ddclient.spec
+++ b/ddclient.spec
@@ -11,7 +11,8 @@ Group:                Networking
 Source0:       http://downloads.sourceforge.net/ddclient/%{name}-%{version}.tar.bz2
 # Source0-md5: 3b426ae52d509e463b42eeb08fb89e0b
 Source1:       %{name}.init
-Source2:       %{name}.NetworkManager
+Source2:       %{name}.sysconfig
+Source3:       %{name}.NetworkManager
 # https://github.com/wimpunk/ddclient
 URL:           http://ddclient.sourceforge.net/
 BuildRequires: rpm-perlprov
@@ -69,11 +70,12 @@ gratuita.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ddclient,/etc/{rc.d/init.d,NetworkManager/dispatcher.d},%{_sbindir},%{_var}/cache/%{name}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ddclient,/etc/{rc.d/init.d,sysconfig,NetworkManager/dispatcher.d},%{_sbindir},%{_var}/cache/%{name}}
 cp -p sample-etc_ddclient.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/50-%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/50-%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,6 +104,7 @@ fi
 %attr(755,root,root) %{_sbindir}/ddclient
 %dir %{_sysconfdir}/%{name}
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ddclient
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %dir %{_var}/cache/%{name}
 %attr(755,root,root) /etc/NetworkManager/dispatcher.d/50-%{name}

diff --git a/ddclient.sysconfig b/ddclient.sysconfig
new file mode 100644 (file)
index 0000000..ff86baa
--- /dev/null
+++ b/ddclient.sysconfig
@@ -0,0 +1,4 @@
+#                                                                     -*- sh -*-
+# ddclient service options, see ddclient --help for what's available.
+#
+#DDCLIENT_OPTIONS="-daemon 300"