For discussion of Alpine Linux development and developer support

1

[alpine-devel] [PATCH] setup-ntp: allow selecting busybox ntpd

Eivind Uggedal
Details
Message ID
<1395060054-31425-1-git-send-email-eivind@uggedal.com>
Sender timestamp
1395060054
DKIM signature
missing
Download raw message
Patch: +8 -4
---
 setup-ntp.in | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setup-ntp.in b/setup-ntp.in
index 38887cede8b8..b544a2a88ab4 100755
--- a/setup-ntp.in
+++ b/setup-ntp.in
@@ -12,7 +12,7 @@ Setup NTP time synchronization
 
 options:
  -h  Show this help
- -c  Choice of NTP daemon: chrony openntpd none
+ -c  Choice of NTP daemon: busybox openntpd chrony none
 __EOF__
         exit 1
 }
@@ -25,7 +25,7 @@ while getopts "hc:" opt; do
 done
 
 if [ -z "$ntpchoice" ]; then
-        echo -n "Which NTP client to run? ('openntpd', 'chrony' or 'none') [chrony] "
+        echo -n "Which NTP client to run? ('busybox', 'openntpd', 'chrony' or 'none') [chrony] "
         default_read ntpchoice "chrony"
 fi
 
@@ -35,6 +35,10 @@ case "$ntpchoice" in
 none|abort)
 	exit 0
 	;;
+busybox)
+	pkgs=''
+	svc=ntpd
+	;;
 chrony)
 	if apk info --installed --quiet acf-core; then
 		pkgs="$pkgs acf-chrony"
@@ -42,11 +46,11 @@ chrony)
 	svc=chronyd
 	;;
 openntpd)
-	svc=ntpd
+	svc=openntpd
 	;;
 esac
 
-apk add --quiet $pkgs
+[ -z "$pkgs" ] || apk add --quiet $pkgs
 rc-update add $svc default
 rc-service $svc start
 
-- 
1.9.0



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20140319140615.0ff9d89e@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1395060054-31425-1-git-send-email-eivind@uggedal.com> (view parent)
Sender timestamp
1395234375
DKIM signature
missing
Download raw message
On Mon, 17 Mar 2014 12:40:54 +0000
Eivind Uggedal <eivind@uggedal.com> wrote:

> ---
>  setup-ntp.in | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)

applied to git. thanks!

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---