components/ntp/patches/etcfix.patch
branchs11-update
changeset 2789 b28fe4d7df32
parent 2788 5d4a0834a077
child 2790 bb5739f8126c
equal deleted inserted replaced
2788:5d4a0834a077 2789:b28fe4d7df32
     1 --- sntp/header.h.orig	Thu May 14 06:34:41 2009
       
     2 +++ sntp/header.h	Thu May 14 06:15:12 2009
       
     3 @@ -19,10 +19,10 @@
       
     4  #define MAX_SOCKETS        10          /* Maximum number of addresses */
       
     5  
       
     6  #ifndef LOCKNAME
       
     7 -#    define LOCKNAME "/etc/sntp.pid"  /* Stores the pid */
       
     8 +#    define LOCKNAME "/var/run/sntp.pid"  /* Stores the pid */
       
     9  #endif
       
    10  #ifndef SAVENAME
       
    11 -#    define SAVENAME "/etc/sntp.state" /* Stores the recovery state */
       
    12 +#    define SAVENAME "/var/ntp/sntp.state" /* Stores the recovery state */
       
    13  #endif
       
    14  
       
    15  
       
    16 --- include/ntp_config.h.orig	Thu May 14 06:34:41 2009
       
    17 +++ include/ntp_config.h	Thu May 14 06:15:12 2009
       
    18 @@ -10,7 +10,7 @@
       
    19   */
       
    20  #ifndef CONFIG_FILE
       
    21  # ifndef SYS_WINNT
       
    22 -#  define	CONFIG_FILE "/etc/ntp.conf"
       
    23 +#  define	CONFIG_FILE "/etc/inet/ntp.conf"
       
    24  # else /* SYS_WINNT */
       
    25  #  define	CONFIG_FILE	"%windir%\\system32\\drivers\\etc\\ntp.conf"
       
    26  #  define	ALT_CONFIG_FILE "%windir%\\ntp.conf"
       
    27 --- libntp/audio.c.orig	Thu May 14 06:34:41 2009
       
    28 +++ libntp/audio.c	Thu May 14 06:15:12 2009
       
    29 @@ -53,7 +53,7 @@
       
    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/ntp.audio"
       
    34 +# define INIT_FILE "/etc/inet/ntp.audio"
       
    35  int agc =	SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
       
    36  int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
       
    37  int devmask = 0;
       
    38 --- ntpdate/ntpdate.c.orig	Thu May 14 06:34:41 2009
       
    39 +++ ntpdate/ntpdate.c	Thu May 14 06:15:12 2009
       
    40 @@ -192,7 +192,7 @@
       
    41  
       
    42  #ifndef KEYFILE
       
    43  # ifndef SYS_WINNT
       
    44 -#define KEYFILE 	"/etc/ntp.keys"
       
    45 +#define KEYFILE 	"/etc/inet/ntp.keys"
       
    46  # else
       
    47  #define KEYFILE 	"%windir%\\ntp.keys"
       
    48  # endif /* SYS_WINNT */
       
    49 --- ntpdate/ntptimeset.c.orig	Thu May 14 06:34:41 2009
       
    50 +++ ntpdate/ntptimeset.c	Thu May 14 06:15:12 2009
       
    51 @@ -270,7 +270,7 @@
       
    52  
       
    53  #ifndef KEYFILE
       
    54  # ifndef SYS_WINNT
       
    55 -#define KEYFILE 	"/etc/ntp.keys"
       
    56 +#define KEYFILE 	"/etc/inet/ntp.keys"
       
    57  # else
       
    58  #define KEYFILE 	"%windir%\\ntp.keys"
       
    59  # endif /* SYS_WINNT */
       
    60 --- ntpdate/ntptime_config.c.orig	Thu May 14 06:34:41 2009
       
    61 +++ ntpdate/ntptime_config.c	Thu May 14 06:15:12 2009
       
    62 @@ -37,7 +37,7 @@
       
    63   */
       
    64  #ifndef CONFIG_FILE
       
    65  # ifndef SYS_WINNT
       
    66 -#  define	CONFIG_FILE "/etc/ntp.conf"
       
    67 +#  define	CONFIG_FILE "/etc/inet/ntp.conf"
       
    68  # else /* SYS_WINNT */
       
    69  #  define	CONFIG_FILE 	"%windir%\\ntp.conf"
       
    70  #  define	ALT_CONFIG_FILE "%windir%\\ntp.ini"
       
    71 --- ntpd/refclock_oncore.c.orig	Thu May 14 06:34:41 2009
       
    72 +++ ntpd/refclock_oncore.c	Thu May 14 06:15:12 2009
       
    73 @@ -1188,7 +1188,7 @@
       
    74  
       
    75  	FILE	*fd;
       
    76  	char	*cp, *cc, *ca, line[100], units[2], device[20], Msg[160], **cpp;
       
    77 -	char	*dirs[] = { "/etc/ntp", "/etc", 0 };
       
    78 +	char	*dirs[] = { "/etc/inet", "/etc", 0 };
       
    79  	int	i, sign, lat_flg, long_flg, ht_flg, mode, mask;
       
    80  	double	f1, f2, f3;
       
    81