[Fai-commit] r6032 - branches/stable/3.4/debian

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:58:01 +0000 (Tue, 17 Aug 2010)
New Revision: 6032

Modified:
   branches/stable/3.4/debian/changelog
Log:
* Makefile, fai-nfsroot.dirs, fai-nfsroot.install, get-boot-info: Install dhclient-fai.conf and dhclient-fai-script into /usr/share/fai instead of /etc/dhcp3 (closes: #585063). * dhcp-edit, control: Updated to work with isc-dhcp-server or dhcp3-server, whichever is available. * fai-guide.txt: Updated to isc-dhcp-server.


Conflicts:

	debian/changelog

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:57:58 UTC (rev 6031)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:58:01 UTC (rev 6032)
@@ -99,7 +99,6 @@
   * make-fai-nfsroot: remove diversion of discover-modprobe
   * make-fai-nfsroot: die() subroutine now takes exit code, remove several
     else branches
-  * savelog.LAST: add ignore pattern
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.3