From 7bac015e93ecc6570b0bed3ec617fb407c162ccb Mon Sep 17 00:00:00 2001 From: guido Date: Fri, 2 May 2014 13:25:43 -0400 Subject: stop/restart ntpd if present to change server time (fix bug #5599) --- lib/leap_cli/remote/tasks.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/leap_cli/remote/tasks.rb b/lib/leap_cli/remote/tasks.rb index 249c107..0a12a95 100644 --- a/lib/leap_cli/remote/tasks.rb +++ b/lib/leap_cli/remote/tasks.rb @@ -38,12 +38,12 @@ task :install_prerequisites, :max_hosts => MAX_HOSTS do run "apt-get update" end leap.log :updating, "server time" do - run "test -f /etc/init.d/ntp || #{apt_get} install ntp && /etc/init.d/ntp stop" + run "( test -f /etc/init.d/ntp && /etc/init.d/ntp stop ) || true" run "test -f /usr/sbin/ntpdate || #{apt_get} install ntpdate" leap.log :running, "ntpdate..." do run "test -f /usr/sbin/ntpdate && ntpdate 0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org" end - run "test -f /etc/init.d/ntp && /etc/init.d/ntp start" + run "( test -f /etc/init.d/ntp && /etc/init.d/ntp start ) || true" end leap.log :installing, "required packages" do run "#{apt_get} install #{leap.required_packages}" -- cgit v1.2.3