[Fai-commit] r3774 - in trunk: debian lib

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

Author: lange
Date: 2006-08-18 16:57:40 +0000 (Fri, 18 Aug 2006)
New Revision: 3774

Modified:
   trunk/debian/changelog
   trunk/lib/get-boot-info
Log:
get network info via DHCP if ip=dhcp was set


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-08-07 14:09:05 UTC (rev 3773)
+++ trunk/debian/changelog	2006-08-18 16:57:40 UTC (rev 3774)
@@ -1,4 +1,4 @@
-fai (3beta) unstable; urgency=low
+fai (3~beta1) unstable; urgency=low
 
   * make pathes conform to FHS : (closes: #340608, #311524, #336650, #309554, #340609)
   * use /srv/tftp/fai    instead of /boot/fai
@@ -40,8 +40,9 @@
   * control: update to Standards-Version: 3.7.2
   * make-fai-bootfloppy: read make-fai-nfsroot.conf instead of fai.conf,
     replace backticks with $()
+  * lib/get-boot-info: get network info via DHCP if ip=dhcp was set
   
- -- Thomas Lange <lange at debian.org>  Sun,  6 Aug 2006 23:02:12 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 18 Aug 2006 18:57:14 +0200
 
 fai (2.10.5) unstable; urgency=high
 

Modified: trunk/lib/get-boot-info
===================================================================
--- trunk/lib/get-boot-info	2006-08-07 14:09:05 UTC (rev 3773)
+++ trunk/lib/get-boot-info	2006-08-18 16:57:40 UTC (rev 3774)
@@ -122,6 +122,7 @@
 boot=0
 dmesg | grep -q "Sending DHCP requests"  && get_dhcp_info
 dmesg | grep -q "Sending BOOTP requests" && get_bootp_info
+[ "$ip" == "dhcp" ] && get_dhcp_info
 
 if [ $boot -eq 0 ]; then
     get_fixed_info