--- dhcpcd-1.3.22-pl1/pathnames.h~ Thu Jan 17 04:18:10 2002 +++ dhcpcd-1.3.22-pl1/pathnames.h Mon Sep 9 19:49:26 2002 @@ -26,8 +26,8 @@ #include #include "dhcpcd.h" -#define PID_FILE_PATH "%s/"PROGRAM_NAME"-%s.pid" -#define CONFIG_DIR "/etc/dhcpc" +#define PID_FILE_PATH "/var/run/"PROGRAM_NAME"-%s.pid" +#define CONFIG_DIR "/var/lib/dhcpc" #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" --- dhcpcd-1.3.22-pl1/dhcpcd.8~ Mon Sep 9 19:50:54 2002 +++ dhcpcd-1.3.22-pl1/dhcpcd.8 Mon Sep 9 19:50:54 2002 @@ -136,7 +136,7 @@ will use .I directory instead of default -.I /etc/dhcpc +.I /var/lib/dhcpc to store configuration information. .TP .BI \-R @@ -265,7 +265,7 @@ .SH FILES .PD 0 .TP -.BI /etc/dhcpc +.BI /var/lib/dhcpc Default .I directory used for storing files @@ -363,7 +363,7 @@ .B dhcpcd exits for any reason. .TP -.BI /dhcpcd-.pid +.BI /var/run/dhcpcd-.pid file containing the process id of .B dhcpcd. The word diff -ur dhcpcd-1.3.22-pl1.orig/client.c dhcpcd-1.3.22-pl1/client.c --- dhcpcd-1.3.22-pl1.orig/client.c Mon Jan 21 00:46:27 2002 +++ dhcpcd-1.3.22-pl1/client.c Fri Oct 11 18:14:08 2002 @@ -1670,7 +1670,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); diff -ur dhcpcd-1.3.22-pl1.orig/signals.c dhcpcd-1.3.22-pl1/signals.c --- dhcpcd-1.3.22-pl1.orig/signals.c Sun Jan 20 23:51:46 2002 +++ dhcpcd-1.3.22-pl1/signals.c Fri Oct 11 18:13:21 2002 @@ -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); } /*****************************************************************************/