[Fai-commit] r5849 - in trunk: debian examples/simple/scripts/FAIBASE lib

[Thomas Lange]

Author: lange
Date: 2010-07-08 22:22:00 +0000 (Thu, 08 Jul 2010)
New Revision: 5849

Modified:
   trunk/debian/changelog
   trunk/examples/simple/scripts/FAIBASE/10-misc
   trunk/lib/subroutines
Log:
10-misc, subroutines: move adding /etc/hosts entry from task_prepareapt
to config space script, add only if host does not belong to class DHCPC

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-08 12:02:25 UTC (rev 5848)
+++ trunk/debian/changelog	2010-07-08 22:22:00 UTC (rev 5849)
@@ -29,6 +29,8 @@
   * put ROOTPW into quotes, so empty password will work (thanks to Adrien
     Cunin for the patch)
   * fai-client.install: remove list_disks
+  * 10-misc, subroutines: move adding /etc/hosts entry from task_prepareapt
+    to config space script, add only if host does not belong to class DHCPC
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: trunk/examples/simple/scripts/FAIBASE/10-misc
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/10-misc	2010-07-08 12:02:25 UTC (rev 5848)
+++ trunk/examples/simple/scripts/FAIBASE/10-misc	2010-07-08 22:22:00 UTC (rev 5849)
@@ -14,6 +14,10 @@
 echo $TIMEZONE    > $target/etc/timezone
 ln -fs /usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime
 
+if [ -n "$IPADDR" ]; then
+    ifclass DHCPC || ainsl -s $FAI_ROOT/etc/hosts "$IPADDR $HOSTNAME.$DOMAIN $HOSTNAME"
+fi
+
 fcopy -iM /etc/hosts /etc/motd
 
 # set root password

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2010-07-08 12:02:25 UTC (rev 5848)
+++ trunk/lib/subroutines	2010-07-08 22:22:00 UTC (rev 5849)
@@ -844,9 +844,6 @@
     # set hostname in $FAI_ROOT
     if [ -f /var/run/fai/FAI_INSTALLATION_IN_PROGRESS ]; then
       echo $HOSTNAME >$FAI_ROOT/etc/hostname
-      if [ -n "$IPADDR" ]; then
-	  ainsl -s $FAI_ROOT/etc/hosts "$IPADDR $HOSTNAME.$DOMAIN $HOSTNAME"
-      fi
     fi