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

[holger at alioth.debian.org]

Author: holger
Date: 2008-08-03 23:33:39 +0000 (Sun, 03 Aug 2008)
New Revision: 135

Modified:
   fai-config/scripts/DEBCONF8/10-fix-fqdn
   fai-config/scripts/FAIBASE/40-misc
Log:
really fix cfengine foo

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

Modified: fai-config/scripts/FAIBASE/40-misc
===================================================================
--- fai-config/scripts/FAIBASE/40-misc	2008-08-03 23:26:10 UTC (rev 134)
+++ fai-config/scripts/FAIBASE/40-misc	2008-08-03 23:33:39 UTC (rev 135)
@@ -10,6 +10,7 @@
 directories:
    any::
 	/tmp mode=1777 owner=0 group=0
+	/etc/mailname mode=0644
 
 editfiles:
    any::