components/ntp/patches/10-etcfix.patch
branchs11u3-sru
changeset 7873 7e3686e70bb8
parent 3925 49fdcf040780
equal deleted inserted replaced
7872:aa4e61b4b594 7873:7e3686e70bb8
    13 -#  define	CONFIG_FILE "/etc/ntp.conf"
    13 -#  define	CONFIG_FILE "/etc/ntp.conf"
    14 +#  define	CONFIG_FILE "/etc/inet/ntp.conf"
    14 +#  define	CONFIG_FILE "/etc/inet/ntp.conf"
    15  # else /* SYS_WINNT */
    15  # else /* SYS_WINNT */
    16  #  define	CONFIG_FILE	"%windir%\\system32\\drivers\\etc\\ntp.conf"
    16  #  define	CONFIG_FILE	"%windir%\\system32\\drivers\\etc\\ntp.conf"
    17  #  define	ALT_CONFIG_FILE "%windir%\\ntp.conf"
    17  #  define	ALT_CONFIG_FILE "%windir%\\ntp.conf"
    18 --- libntp/audio.c.orig	Thu May 14 06:34:41 2009
    18 *** libntp/audio.c
    19 +++ libntp/audio.c	Thu May 14 06:15:12 2009
    19 --- libntp/audio.c
    20 @@ -53,7 +53,7 @@
    20 *************** typedef int ioctl_arg_T;
    21  static struct audio_device device; /* audio device ident */
    21 *** 66,72 ****
    22  #endif /* HAVE_SYS_AUDIOIO_H */
    22   static struct audio_device device; /* audio device ident */
    23  #ifdef PCM_STYLE_SOUND
    23   #endif /* HAVE_SYS_AUDIOIO_H */
    24 -# define INIT_FILE "/etc/ntp.audio"
    24   #ifdef PCM_STYLE_SOUND
    25 +# define INIT_FILE "/etc/inet/ntp.audio"
    25 ! # define INIT_FILE "/etc/ntp.audio"
    26  int agc =	SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
    26   
    27  int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
    27   static ioctl_arg_T agc		= SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
    28  int devmask = 0;
    28   static ioctl_arg_T audiomonitor	= SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
       
    29 --- 66,72 ----
       
    30   static struct audio_device device; /* audio device ident */
       
    31   #endif /* HAVE_SYS_AUDIOIO_H */
       
    32   #ifdef PCM_STYLE_SOUND
       
    33 ! # define INIT_FILE "/etc/inet/ntp.audio"
       
    34   
       
    35   static ioctl_arg_T agc		= SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
       
    36   static ioctl_arg_T audiomonitor	= SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
    29 --- ntpdate/ntpdate.c.orig	Thu May 14 06:34:41 2009
    37 --- ntpdate/ntpdate.c.orig	Thu May 14 06:34:41 2009
    30 +++ ntpdate/ntpdate.c	Thu May 14 06:15:12 2009
    38 +++ ntpdate/ntpdate.c	Thu May 14 06:15:12 2009
    31 @@ -179,7 +179,7 @@
    39 @@ -179,7 +179,7 @@
    32  
    40  
    33  #ifndef KEYFILE
    41  #ifndef KEYFILE