--- a/components/ntp/Solaris/ntp.sh Mon May 09 19:08:12 2016 -0700
+++ b/components/ntp/Solaris/ntp.sh Mon May 09 19:08:13 2016 -0700
@@ -50,7 +50,7 @@
# Build the command line flags
#
shift $#
-set -- -p /var/run/ntp.pid
+set -- --pidfile /var/run/ntp.pid
# We allow a step larger than the panic value of 17 minutes only
# once when ntpd starts up. If always_allow_large_step is true,
# then we allow this each time ntpd starts. Otherwise, we allow
@@ -60,7 +60,7 @@
val=`svcprop -c -p config/always_allow_large_step $SMF_FMRI`
if [ "$val" = "true" ] || \
[ ! -f /var/run/ntp.pid ]; then
- set -- "[email protected]" -g
+ set -- "[email protected]" --panicgate
fi
# Auth was off by default in xntpd now the default is on. Better have a way
@@ -77,12 +77,12 @@
# Set up logging if requested.
logfile=`svcprop -c -p config/logfile $SMF_FMRI`
val=`svcprop -c -p config/verbose_logging $SMF_FMRI`
-[ "$val" = "true" ] && [ -n "$logfile" ] && set -- "[email protected]" -l $logfile
+[ "$val" = "true" ] && [ -n "$logfile" ] && set -- "[email protected]" --logfile $logfile
# Register with mDNS.
val=`svcprop -c -p config/mdnsregister $SMF_FMRI`
mdns=`svcprop -c -p general/enabled svc:/network/dns/multicast:default`
-[ "$val" = "true" ] && [ "$mdns" = "true" ] && set -- "[email protected]" -m
+[ "$val" = "true" ] && [ "$mdns" = "true" ] && set -- "[email protected]" --mdns
# We used to support the slewalways keyword, but that was a Sun thing
# and not in V4. Look for "slewalways yes" and set the new slew option.
@@ -105,7 +105,7 @@
val=`svcprop -c -p config/allow_step_at_boot $SMF_FMRI`
if [ "$val" = "true" ] && [ "$slew_always" = "true" ] && \
[ ! -f /var/run/ntp.pid ]; then
- set -- "[email protected]" -G
+ set -- "[email protected]" --force-step-once
fi
# Start the daemon. If debugging is requested, put it in the background,