[Initscripts-ng-commits] r480 - in /trunk/src/insserv/debian: changelog patches/31_debian_conf.dpatch run-testsuite

[pere at users.alioth.debian.org]

Author: pere
Date: Tue Jan  8 15:48:05 2008
New Revision: 480

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=480
Log:
  * Remove ntpdate and ntp-server as optional dependencies for $time,
    to avoid dependency loop between nfs-common and the ntp server.
    Both are obsolete, and changing them to the current 'ntp' would
    make a loop.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/31_debian_conf.dpatch
    trunk/src/insserv/debian/run-testsuite

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=480&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Tue Jan  8 15:48:05 2008
@@ -4,6 +4,10 @@
     generate a combined graph for boot and shutdown dependencies.
   * Split test suite into two files, one generic part
     (testsuite-common) and one Debian specific part (run-testsuite).
+  * Remove ntpdate and ntp-server as optional dependencies for $time,
+    to avoid dependency loop between nfs-common and the ntp server.
+    Both are obsolete, and changing them to the current 'ntp' would
+    make a loop.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon,  8 Jan 2008 16:37:53 +0100
 

Modified: trunk/src/insserv/debian/patches/31_debian_conf.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/31_debian_conf.dpatch?rev=480&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/31_debian_conf.dpatch (original)
+++ trunk/src/insserv/debian/patches/31_debian_conf.dpatch Tue Jan  8 15:48:05 2008
@@ -50,7 +50,7 @@
  # The system time has been set correctly
  #
 -$time		boot.clock +xntpd
-+$time		hwclock +ntpdate +ntp-server
++$time		hwclock
  
  #
  # Services which need to be interactive

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=480&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Tue Jan  8 15:48:05 2008
@@ -28,7 +28,7 @@
 $remote_fs      $local_fs +mountnfs +mountnfs-bootclean +umountnfs +sendsigs
 $syslog         +syslog +sysklogd
 $portmap        portmap
-$time           hwclock +ntpdate +ntp-server
+$time           hwclock
 <interactive>   udev mountdevsubfs checkroot checkfs console-screen
 EOF