Attachment 290382 Details for Bug 426749 – Unified diff between RH ntpd script and mine

[patch] Unified diff between RH ntpd script and mine

ntpd.udiff (text/plain), 4.70 KB, created by David Tonhofer on 2007-12-25 20:10:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Tonhofer

Created: 2007-12-25 20:10:17 UTC

Size: 4.70 KB

patch

obsolete

>--- ntpd.original.rh	2007-12-25 21:00:26.000000000 +0100
>+++ ntpd.modified	2007-12-25 20:47:38.000000000 +0100
>@@ -3,7 +3,7 @@
> # ntpd		This shell script takes care of starting and stopping
> #		ntpd (NTPv4 daemon).
> #
>-# chkconfig: - 58 74
>+# chkconfig: 2345 58 74
> # description: ntpd is the NTPv4 daemon. \
> # The Network Time Protocol (NTP) is used to synchronize the time of \
> # a computer client or server to another server or reference time source, \
>@@ -18,17 +18,24 @@
> # Check that networking is up.
> [ ${NETWORKING} = "no" ] && exit 0
> 
>+# Source any additional options
> if [ -f /etc/sysconfig/ntpd ];then
>         . /etc/sysconfig/ntpd
> fi
> 
>+# Default configuration file (may be overridden through /etc/sysconfig/ntpd)
> ntpconf=/etc/ntp.conf
>+
>+# List of NTP servers which are used to "step" the clock once to a correct value
>+# at startup using "ntpdate" (this usage is deprecated, see the ntpd manpage)
> ntpstep=/etc/ntp/step-tickers
> 
> 
> RETVAL=0
> prog="ntpd"
> 
>+# Synchronize hardware clock to the system time after a successful "ntpdate"
>+# execution at startup (this operation is done by ntpd while it runs normally)
> sync_hwclock() {
> 	ARC=0
> 	SRM=0
>@@ -61,18 +68,36 @@
> 	action $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
> }
> 
>+# Additional configuration check at startup; interpretes the arguments set by the
>+# sourcing of "/etc/sysconfig/ntpd": OPTIONS, USE_NTPDATE, SYNC_HWCLOCK
> readconf() {
> 	dostep=''
> 	dropstr=''
>+	tickers=''
> 	OPTIND=1
>+        if [ "$USE_NTPDATE" = "yes" ]; then
>+           # Use "ntpdate" to step the clocks to a correct value using the
>+           # NTP servers listed in the "step-tickers" file once before "ntpd" is
>+           # started. This may be useful for clocks that go wrong quickly.
>+           dostep=yes
>+        fi
>+        # Check OPTIONS to be passed to ntpd.
>+        # By default OPTIONS is equal to "-u ntp -p /var/run/ntpd.pid".
>+        # We will now check for the presence of "-c" and "-u":
>+        # "-c" is used to set another configuration file
>+        # "-u" is used to change user (-U is deprecated; any "group" is irrelevant
>+        #      and filtered out)
> 	while getopts ":aAbc:dD:f:gi:k:l:LmnN:p:P:qr:s:t:u:U:v:V:x" args $OPTIONS;
> 	do 
> 	  case "$args" in
>-	    x) dostep=yes;;
>-	    c) ntpconf="$OPTARG";;
>-	    u|U) dropstr="-U $(echo $OPTARG | sed 's/:.*//')"
>+	    x) if [ -z "$USE_NTPDATE" ]; then
>+		     echo "The '-x' in /etc/sysconfig/ntpd no longer starts ntpdate; use USE_NTPDATE=yes instead"
>+	       fi
>+               ;;
>+	    c) ntpconf="$OPTARG";; # override the default ntpconf by the one given
>+	    u|U) dropstr="-U $(echo $OPTARG | sed 's/:.*//')" # dropstr will be used for "ntpdate"
> 	         if [ "$args" = "U" ]; then
>-	             # correct the options string
>+	             # correct the OPTIONS string for "ntpd"
> 	             OPTIONS=$(echo $OPTIONS | sed 's/-U/-u/g')
> 	             echo "Please change '-U' to '-u' in /etc/sysconfig/ntpd"
> 	         fi
>@@ -80,18 +105,23 @@
> 	  esac
> 	done
> 
>+        # Check that the "ntpd" executable and the config file actually exist
> 	[ -x /usr/sbin/ntpd -a -f $ntpconf ] || exit 0
> 
>-	tickers=''
>-	if [ -s "$ntpstep" ]; then
>-	    tickers=$(sed 's/#.*//' $ntpstep)
>-	    echo "$tickers" | grep -qi '[a-z0-9]' && dostep=yes || tickers=''
>-	fi
>-	if [ -n "$dostep" -a -z "$tickers" ]; then
>-	    # -x option is used, but step-tickers doesn't exist or contain
>-	    # anything useful, use servers from ntp.conf instead
>-	    tickers=$(awk '$1=="peer"||$1=="server"{print $2}' $ntpconf | \
>-	        fgrep -v 127.127.1.0)
>+        # Collect the "step tickers" i.e. the NTP servers for "ntpdate", but only
>+        # if necessary
>+        if [ -n "$dostep" ]; then 
>+	    if [ -s "$ntpstep" ]; then
>+               # file "$ntpstep" exists and contains text; eliminate comments and set 
>+	       tickers=$(sed 's/#.*//' $ntpstep)
>+               # unset "tickers" again if actually no valid lines found
>+	       echo "$tickers" | grep -qi '[a-z0-9]' && dostep=yes || tickers=''
>+  	    fi
>+	    if [ -z "$tickers" ]; then
>+	       # tickers still not set, use servers from ntp.conf instead
>+	       tickers=$(awk '$1=="peer"||$1=="server"{print $2}' $ntpconf | \
>+	           fgrep -v 127.127.1.0)
>+	    fi
> 	fi
> }
> 
>@@ -109,11 +139,10 @@
> 	    else
> 	        OPTIONS="$OPTIONS -g"
> 	    fi
>-	else
>-	    # -g can replace the grep for time servers
>-	    # as it permits ntpd to violate its 1000s limit once.
>-	    OPTIONS="$OPTIONS -g"
>-	fi
>+        fi
>+	# -g can replace the grep for time servers
>+	# as it permits ntpd to violate its 1000s limit once.
>+        # if "-g" is desired, set it in OPTIONS.
>         # Start daemons.
>         echo -n $"Starting $prog: "
>         daemon ntpd $OPTIONS
>@@ -162,3 +191,4 @@
> esac
> 
> exit $RETVAL
>+

Actions: View | Diff

Attachments on bug 426749: 290380 | 290381 | 290382