[Fai-commit] r5995 - in branches/stable/3.4: debian examples/simple/scripts/FAIBASE lib

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:55:02 +0000 (Tue, 17 Aug 2010)
New Revision: 5995

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/examples/simple/scripts/FAIBASE/10-misc
   branches/stable/3.4/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


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:54:58 UTC (rev 5994)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:55:02 UTC (rev 5995)
@@ -28,6 +28,9 @@
     them later again (thanks to Andreas Schuldei)
   * 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: branches/stable/3.4/examples/simple/scripts/FAIBASE/10-misc
===================================================================
--- branches/stable/3.4/examples/simple/scripts/FAIBASE/10-misc	2010-08-17 12:54:58 UTC (rev 5994)
+++ branches/stable/3.4/examples/simple/scripts/FAIBASE/10-misc	2010-08-17 12:55:02 UTC (rev 5995)
@@ -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: branches/stable/3.4/lib/subroutines
===================================================================
--- branches/stable/3.4/lib/subroutines	2010-08-17 12:54:58 UTC (rev 5994)
+++ branches/stable/3.4/lib/subroutines	2010-08-17 12:55:02 UTC (rev 5995)
@@ -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