[Fai-commit] r3503 - in trunk: . bin conf debian lib

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-06-09 13:15:26 +0000 (Fri, 09 Jun 2006)
New Revision: 3503

Added:
   trunk/bin/dhclient-fai-script
   trunk/conf/dhclient-fai.conf
Removed:
   trunk/bin/dhclient-script
   trunk/conf/dhclient.conf
Modified:
   trunk/Makefile
   trunk/debian/changelog
   trunk/debian/fai-nfsroot.install
   trunk/debian/fai-nfsroot.postrm
   trunk/debian/fai-nfsroot.preinst
   trunk/lib/get-boot-info
Log:
do not use dpkg-divert for dhcp things, instead call dhclient with
different configuration file and script (closes: #369265)


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-06-08 14:50:47 UTC (rev 3502)
+++ trunk/Makefile	2006-06-09 13:15:26 UTC (rev 3503)
@@ -30,8 +30,8 @@
 	cd bin ; install $(USRSBIN_SCRIPTS) $(DESTDIR)/usr/sbin
 	cd bin ; install $(USRBIN_SCRIPTS) $(DESTDIR)/usr/bin
 	install bin/fai-start-stop-daemon $(DESTDIR)/sbin
-	install bin/dhclient-script  $(DESTDIR)/etc/dhcp3
-	install -m644 conf/dhclient.conf $(DESTDIR)/etc/dhcp3
+	install bin/dhclient-fai-script  $(DESTDIR)/etc/dhcp3
+	install -m644 conf/dhclient-fai.conf $(DESTDIR)/etc/dhcp3
 	install -m644 conf/apt.conf $(DESTDIR)/etc/apt/apt.conf.d/90fai
 	install -m644 conf/fai.conf conf/sources.list conf/menu.lst $(DESTDIR)/etc/fai/
 	install -m644 conf/make-fai-nfsroot.conf $(DESTDIR)/etc/fai/

Copied: trunk/bin/dhclient-fai-script (from rev 3156, trunk/bin/dhclient-script)

Deleted: trunk/bin/dhclient-script
===================================================================
--- trunk/bin/dhclient-script	2006-06-08 14:50:47 UTC (rev 3502)
+++ trunk/bin/dhclient-script	2006-06-09 13:15:26 UTC (rev 3503)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# execute perl script to obtain dhcp data
-
-perl /usr/lib/fai/dhclient-perl

Copied: trunk/conf/dhclient-fai.conf (from rev 3171, trunk/conf/dhclient.conf)

Deleted: trunk/conf/dhclient.conf
===================================================================
--- trunk/conf/dhclient.conf	2006-06-08 14:50:47 UTC (rev 3502)
+++ trunk/conf/dhclient.conf	2006-06-09 13:15:26 UTC (rev 3503)
@@ -1,16 +0,0 @@
-# $Id$
-
-# fai configuration for dhclient v3
-
-request
-
-  subnet-mask, domain-name-servers, domain-name,
-  host-name, routers, time-servers, ntp-servers, 
-  nis-domain, nis-servers, tftp-server-name;
-
-send dhcp-max-message-size 2048;
-
-timeout 30;
-retry 2;
-initial-interval 1;
-

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-06-08 14:50:47 UTC (rev 3502)
+++ trunk/debian/changelog	2006-06-09 13:15:26 UTC (rev 3503)
@@ -1,7 +1,9 @@
-fai (2.10.2) unstable; urgency=low
+fai (2.10.2) unstable; urgency=medium
 
-  * prepare patch for grave bug, test 12
-
+  * lib/get-boot-info: call dhclient with different configuration and
+    script names (closes: #369265), remove dpkg-divert calls for
+    /etc/dhcp3/dhclient-script and /etc/dhcp3/dhclient.conf
+ 
  -- Thomas Lange <lange at debian.org>  Tue,  6 Jun 2006 12:34:38 +0200
 
 fai (2.10.1) unstable; urgency=low

Modified: trunk/debian/fai-nfsroot.install
===================================================================
--- trunk/debian/fai-nfsroot.install	2006-06-08 14:50:47 UTC (rev 3502)
+++ trunk/debian/fai-nfsroot.install	2006-06-09 13:15:26 UTC (rev 3503)
@@ -8,7 +8,7 @@
 usr/lib/fai/mount2dir
 usr/lib/fai/task_sysinfo
 usr/lib/fai/mkrw
-etc/dhcp3/dhclient-script
-etc/dhcp3/dhclient.conf
+etc/dhcp3/dhclient-fai-script
+etc/dhcp3/dhclient-fai.conf
 etc/apt/apt.conf.d/90fai
 etc/modutils/fai_modules_off

Modified: trunk/debian/fai-nfsroot.postrm
===================================================================
--- trunk/debian/fai-nfsroot.postrm	2006-06-08 14:50:47 UTC (rev 3502)
+++ trunk/debian/fai-nfsroot.postrm	2006-06-09 13:15:26 UTC (rev 3503)
@@ -1,8 +1,6 @@
 #!/bin/sh -e
 
 if [ remove = "$1" ]; then
-    dpkg-divert --package fai-nfsroot --remove --rename /etc/dhcp3/dhclient-script
-    dpkg-divert --package fai-nfsroot --remove --rename /etc/dhcp3/dhclient.conf
     dpkg-divert --package fai-nfsroot --remove --rename /etc/init.d/rcS
 fi
 

Modified: trunk/debian/fai-nfsroot.preinst
===================================================================
--- trunk/debian/fai-nfsroot.preinst	2006-06-08 14:50:47 UTC (rev 3502)
+++ trunk/debian/fai-nfsroot.preinst	2006-06-09 13:15:26 UTC (rev 3503)
@@ -5,8 +5,6 @@
     exit 1
 fi
 
-dpkg-divert --package fai-nfsroot --add --rename /etc/dhcp3/dhclient-script
-dpkg-divert --package fai-nfsroot --add --rename /etc/dhcp3/dhclient.conf
 dpkg-divert --package fai-nfsroot --add --rename /etc/init.d/rcS
 
 #DEBHELPER#

Modified: trunk/lib/get-boot-info
===================================================================
--- trunk/lib/get-boot-info	2006-06-08 14:50:47 UTC (rev 3502)
+++ trunk/lib/get-boot-info	2006-06-09 13:15:26 UTC (rev 3503)
@@ -62,7 +62,7 @@
 get_dhcp_info() {
 
     boot=1
-    dhclient -lf /dev/null $netdevices >>$bootlog 2> $LOGDIR/dhclient.log
+    dhclient -lf /dev/null -cf /etc/dhcp3/dhclient-fai.conf -sf /etc/dhcp3/dhclient-fai-script $netdevices >>$bootlog 2> $LOGDIR/dhclient.log
     killall dhclient
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -