diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/openntpd/files | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/openntpd/files')
| -rw-r--r-- | package/openntpd/files/ntpd.init | 4 | ||||
| -rw-r--r-- | package/openntpd/files/openntpd.postinst | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/package/openntpd/files/ntpd.init b/package/openntpd/files/ntpd.init index 42e068860..fd655e9cc 100644 --- a/package/openntpd/files/ntpd.init +++ b/package/openntpd/files/ntpd.init @@ -7,7 +7,7 @@ case $1 in autostop) ;; autostart) - [[ $ntpd_flags = NO ]] && exit 0 + test x"${ntpd:-NO}" = x"NO" && exit 0 exec sh $0 start ;; start) @@ -15,7 +15,7 @@ start) /usr/sbin/ntpd $ntpd_flags ;; stop) - kill $(pidof ntpd|cut -d ' ' -f 3) + pkill ntpd ;; restart) sh $0 stop diff --git a/package/openntpd/files/openntpd.postinst b/package/openntpd/files/openntpd.postinst index 53bc8c387..c6d0bd33d 100644 --- a/package/openntpd/files/openntpd.postinst +++ b/package/openntpd/files/openntpd.postinst @@ -4,4 +4,5 @@ gid=$(get_next_gid) add_group ntp $gid add_user ntp $(get_next_uid) $gid /tmp/.ntp add_service ntp 123/udp -add_rcconf 'e.g. "-s"' ntpd_flags +add_rcconf ntpd_flags ntpd_flags "-s" +add_rcconf ntpd ntpd NO |