[Debconf-video-commits] r132 - in fai-config/scripts: DEBCONF8 FAIBASE

[holger at alioth.debian.org]

Author: holger
Date: 2008-08-03 22:52:03 +0000 (Sun, 03 Aug 2008)
New Revision: 132

Modified:
   fai-config/scripts/DEBCONF8/10-fix-fqdn
   fai-config/scripts/FAIBASE/40-misc
Log:
hopefully fix cfengine syntax errors

Modified: fai-config/scripts/DEBCONF8/10-fix-fqdn
===================================================================
--- fai-config/scripts/DEBCONF8/10-fix-fqdn	2008-08-03 22:47:09 UTC (rev 131)
+++ fai-config/scripts/DEBCONF8/10-fix-fqdn	2008-08-03 22:52:03 UTC (rev 132)
@@ -4,6 +4,8 @@
    any::
    actionsequence = ( files directories editfiles )
    EditFileSize = ( 30000 )
+   myhostname = ( "$(HOSTNAME)" )
+   myipaddress = ( "$(IPADDRESS)" )
 
 files:
    any::
@@ -13,6 +15,6 @@
 	{ /etc/hosts
 	  DeleteLinesStarting '127.0'
 	  AppendIfNoSuchLine '127.0.0.1       localhost'
-	  AppendIfNoSuchLine "$(IPADDRESS)    $(HOSTNAME) $(HOSTNAME).dc8.debconf.org"
+	  AppendIfNoSuchLine "$(myipaddress)    $(myhostname) $(myhostname).dc8.debconf.org"
 	}
 

Modified: fai-config/scripts/FAIBASE/40-misc
===================================================================
--- fai-config/scripts/FAIBASE/40-misc	2008-08-03 22:47:09 UTC (rev 131)
+++ fai-config/scripts/FAIBASE/40-misc	2008-08-03 22:52:03 UTC (rev 132)
@@ -3,6 +3,7 @@
 control:
    actionsequence = ( files directories editfiles )
    EditFileSize = ( 30000 )
+   myhostname = ( "$(HOSTNAME)" )
 
 files:
    any::
@@ -15,7 +16,7 @@
    any::
 	{ /etc/mailname
 	  AutoCreate
-          AppendIfNoSuchLine "$(HOSTNAME)"
+          AppendIfNoSuchLine "$(myhostname)"
 	}
 
 	{ /etc/default/rcS