- updated to 1.3.22pl4

[packages/dhcpcd.git] / dhcpcd-paths_fixes.patch

--- ./dhcpcd.c.org4	Wed Jan  1 02:26:32 2003
+++ ./dhcpcd.c	Mon Jan  6 12:55:05 2003
@@ -88,7 +88,7 @@
 {
   int o;
   char pidfile[64];
-  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt);
+  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,IfNameExt);
   o=open(pidfile,O_RDONLY);
   if ( o == -1 ) return;
   close(o);
--- ./pathnames.h.org4	Sun Sep 29 17:55:31 2002
+++ ./pathnames.h	Mon Jan  6 12:50:24 2003
@@ -26,7 +26,7 @@
 #include <paths.h>
 #include "dhcpcd.h"
 
-#define PID_FILE_PATH		"%s/"PROGRAM_NAME"-%s.pid"
+#define PID_FILE_PATH		"/var/run/"PROGRAM_NAME"-%s.pid"
 #define DHCP_CACHE_FILE		"%s/"PROGRAM_NAME"-%s.cache"
 #define DHCP_HOSTINFO		"%s/"PROGRAM_NAME"-%s.info"
 #define EXEC_ON_CHANGE		"%s/"PROGRAM_NAME".exe"
@@ -37,10 +37,10 @@
 #define NIS_CONF		"/etc/config/yp.conf"
 #define NTP_CONF		"/etc/config/ntp.conf"
 #else
-#define CONFIG_DIR		"/etc/dhcpc"
+#define CONFIG_DIR		"/var/lib/dhcpc"
 #define RESOLV_CONF		"/etc/resolv.conf"
 #define NIS_CONF		"/etc/yp.conf"
-#define NTP_CONF		"/etc/ntp.conf"
+#define NTP_CONF		"/etc/ntp/ntp.conf"
 #endif
 
 #endif
--- ./dhcpcd.8.org4	Wed Jan  1 02:31:31 2003
+++ ./dhcpcd.8	Mon Jan  6 12:52:50 2003
@@ -137,7 +137,7 @@
 will use
 .I <ConfigDir>
 directory instead of default
-.I /etc/dhcpc
+.I /var/lib/dhcpc
 to store configuration information.
 .TP
 .BI \-S
@@ -281,7 +281,7 @@
 .SH FILES
 .PD 0
 .TP
-.BI /etc/dhcpc
+.BI /var/lib/dhcpc
 Default 
 .I <ConfigDir>
 directory used for storing files
@@ -379,7 +379,7 @@
 .B dhcpcd
 exits for any reason.
 .TP
-.BI <ConfigDir>/dhcpcd-<interface>.pid
+.BI  /var/run/dhcpcd-<interface>.pid
 file containing the process id of
 .B dhcpcd.
 The word
--- ./signals.c.org4	Sun Jan 20 23:51:46 2002
+++ ./signals.c	Mon Jan  6 12:56:58 2003
@@ -44,7 +44,7 @@
   FILE *fp;
   pid_t pid;
   char pidfile[64];
-  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt);
+  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,IfNameExt);
   fp=fopen(pidfile,"r");
   if ( fp == NULL ) goto ntrn;
   fscanf(fp,"%u",&pid);
@@ -63,7 +63,7 @@
 {
   FILE *fp;
   char pidfile[64];
-  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt);
+  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,IfNameExt);
   fp=fopen(pidfile,"w");
   if ( fp == NULL )
     {
@@ -77,7 +77,7 @@
 void deletePidFile()
 {
   char pidfile[64];
-  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt);
+  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,IfNameExt);
   unlink(pidfile);
 }
 /*****************************************************************************/