From 2ae1918a85901681f301ecb9edba6d04cecfb980 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 7 Feb 2012 12:23:23 +0100 Subject: [PATCH] clockspeed: fixed clockctl.sh to exit 1 when the adjust fifo doesn't exist --- network/clockspeed/clockctl.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/network/clockspeed/clockctl.sh b/network/clockspeed/clockctl.sh index 47f9c9c10..7b0fcb619 100644 --- a/network/clockspeed/clockctl.sh +++ b/network/clockspeed/clockctl.sh @@ -3,7 +3,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../clockspeed/clockctl.sh -# Copyright (C) 2008 - 2011 The OpenSDE Project +# Copyright (C) 2008 - 2012 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -51,12 +51,10 @@ case "$1" in D_bindir/clockview < /var/state/clockspeed/atto ;; m|mark) - if [ ! -p /var/state/clockspeed/adjust ]; then - echo "Cannot obtain new calibration mark (clockspeed running?)" - else - echo "Obtaining new calibration mark from master server at ${CLOCK_IP}:" - clock_pick | tee /var/state/clockspeed/adjust | D_bindir/clockview - fi + [ -p /var/state/clockspeed/adjust ] || + die "Cannot obtain new calibration mark (clockspeed running?)" + echo "Obtaining new calibration mark from master server at ${CLOCK_IP}:" + clock_pick | tee /var/state/clockspeed/adjust | D_bindir/clockview ;; s|sync) echo "Setting system clock with master server at ${CLOCK_IP}:"