SOURCES: dhcpcd-ntp-path.patch - up for 3.1.8

[shadzik]

Author: shadzik                      Date: Mon Nov 26 19:24:14 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 3.1.8

---- Files affected:
SOURCES:
   dhcpcd-ntp-path.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/dhcpcd-ntp-path.patch
diff -u SOURCES/dhcpcd-ntp-path.patch:1.7 SOURCES/dhcpcd-ntp-path.patch:1.8
--- SOURCES/dhcpcd-ntp-path.patch:1.7	Mon Aug 27 22:27:57 2007
+++ SOURCES/dhcpcd-ntp-path.patch	Mon Nov 26 20:24:09 2007
@@ -1,35 +1,35 @@
---- dhcpcd-3.1.5/config.h	2007-08-27 22:43:51.614826538 +0300
-+++ dhcpcd-3.1.5/config.h	2007-08-27 23:23:49.078758408 +0300
-@@ -52,21 +52,21 @@
- #define RESOLVCONF          "/sbin/resolvconf"
+--- dhcpcd-3.1.8/config.h.orig	2007-11-17 14:11:04.000000000 +0100
++++ dhcpcd-3.1.8/config.h	2007-11-26 20:14:13.718144517 +0100
+@@ -42,15 +42,15 @@
+ #define PACKAGE             "dhcpcd"
  
  #define ETCDIR              "/etc"
 -#define RESOLVFILE          ETCDIR "/resolv.conf"
 +#define RESOLVFILE          "/etc/resolv.conf"
  
 -#define NISFILE             ETCDIR "/yp.conf"
--#define NISSERVICE          ETCDIR "/init.d/ypbind"
--#define NISRESTARTARGS      "--nodeps", "--quiet", "conditionalrestart"
 +#define NISFILE             "/etc/yp.conf"
-+#define NISSERVICE          "/etc/rc.d/init.d/ypbind"
-+#define NISRESTARTARGS      "condrestart"
  
 -#define NTPFILE             ETCDIR "/ntp.conf"
 -#define NTPDRIFTFILE        ETCDIR "/ntp.drift"
 +#define NTPFILE             "/etc/ntp/ntp.conf"
 +#define NTPDRIFTFILE        "/etc/ntp/ntp.drift"
  #define NTPLOGFILE          "/var/log/ntp.log"
--#define NTPSERVICE          ETCDIR "/init.d/ntpd"
--#define NTPRESTARTARGS      "--nodeps", "--quiet", "conditionalrestart"
-+#define NTPSERVICE          "/etc/rc.d/init.d/ntpd"
-+#define NTPRESTARTARGS      "condrestart"
  
 -#define OPENNTPFILE         ETCDIR "/ntpd.conf"
--#define OPENNTPSERVICE      ETCDIR "/init.d/ntpd"
--#define OPENNTPRESTARTARGS  "--nodeps", "--quiet", "conditionalrestart"
 +#define OPENNTPFILE         "/etc/ntpd/ntpd.conf"
-+#define OPENNTPSERVICE      "/etc/rc.d/init.d/ntpd"
-+#define OPENNTPRESTARTARGS  "condrestart"
  
  #define DEFAULT_SCRIPT      ETCDIR "/" PACKAGE ".sh"
  
+@@ -70,9 +70,9 @@
+  * SYSV should cover everthing else */
+ #ifdef ENABLE_OPENRC
+ # define SERVICE             "OPENRC"
+-# define NISSERVICE          ETCDIR "/init.d/ypbind"
++# define NISSERVICE          "/etc/rc.d/init.d/ypbind"
+ # define NISRESTARTARGS      "--nodeps", "--quiet", "conditionalrestart"
+-# define NTPSERVICE          ETCDIR "/init.d/ntpd"
++# define NTPSERVICE          "/etc/rc.d/init.d/ntpd"
+ # define NTPRESTARTARGS      "--nodeps", "--quiet", "conditionalrestart"
+ #elif ENABLE_BSDRC
+ # define SERVICE             "BSDRC"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dhcpcd-ntp-path.patch?r1=1.7&r2=1.8&f=u