diff options
| author | lianep <none@none> | 2006-06-08 14:47:08 -0700 |
|---|---|---|
| committer | lianep <none@none> | 2006-06-08 14:47:08 -0700 |
| commit | eaa0962daa5398b8d08376d2c36d6f72906490a2 (patch) | |
| tree | 5826fab047e33fbbd4898ce239f2b24ff90d5baf /usr/src | |
| parent | 37e7ac7e391f057708c30fadd34e0062b0aaab56 (diff) | |
| download | illumos-joyent-eaa0962daa5398b8d08376d2c36d6f72906490a2.tar.gz | |
6244405 NTP service has inappropriate and hidden dependencies
Contributed by Richard Lowe <richlowe@richlowe.net>.
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/xntpd/xntpd/ntp.xml | 10 | ||||
| -rw-r--r-- | usr/src/cmd/xntpd/xntpd/xntp | 10 |
2 files changed, 7 insertions, 13 deletions
diff --git a/usr/src/cmd/xntpd/xntpd/ntp.xml b/usr/src/cmd/xntpd/xntpd/ntp.xml index 3fdbabb909..0c8bbb9a3c 100644 --- a/usr/src/cmd/xntpd/xntpd/ntp.xml +++ b/usr/src/cmd/xntpd/xntpd/ntp.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- - Copyright 2004 Sun Microsystems, Inc. All rights reserved. + Copyright 2006 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. ident "%Z%%M% %I% %E% SMI" @@ -23,14 +23,6 @@ <single_instance /> - <dependency name='paths' - grouping='require_all' - restart_on='error' - type='path'> - <service_fmri value='file://localhost/usr/sbin/ntpdate' /> - <service_fmri value='file://localhost/usr/sbin/ntpq' /> - </dependency> - <!-- In its multicast mode, xntpd(1M) requires the default multicast route to be established. diff --git a/usr/src/cmd/xntpd/xntpd/xntp b/usr/src/cmd/xntpd/xntpd/xntp index d6d51b0896..a8c64b45dd 100644 --- a/usr/src/cmd/xntpd/xntpd/xntp +++ b/usr/src/cmd/xntpd/xntpd/xntp @@ -1,16 +1,18 @@ #!/sbin/sh # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -# Service Method Support Program (Script) for the NTP service -# . /lib/svc/share/smf_include.sh -[ -f /etc/inet/ntp.conf ] || exit $SMF_EXIT_ERR_CONFIG +if [ ! -f /etc/inet/ntp.conf ]; then + echo "Error: Configuration file '/etc/inet/ntp.conf' not found." \ + " See xntpd(1M)." + exit $SMF_EXIT_ERR_CONFIG +fi ARGS=`/usr/bin/nawk ' BEGIN { |