[debian-edu-commits] debian-edu/ 01/03: [ Ronny Aasen and Petter Reinholdtsen ] * Fixed a bug in cfengine's ltsp_arch variable, that broke the installer. Based on patch from Klaus Ade Johnstad. Fixes skolelinux bug #1196.

[Alexander Alemayhu]

This is an automated email from the git hooks/post-receive script.

ccscanf-guest pushed a commit to annotated tag 0.412.0.edu.etch.1+svn34872
in repository debian-edu-config.

commit 8ae1ddc3ec703d92468ecc329370c621d0ccc718
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Jun 19 19:44:27 2007 +0000

      [ Ronny Aasen and Petter Reinholdtsen ]
      * Fixed a bug in cfengine's ltsp_arch variable, that broke the
        installer.  Based on patch from Klaus Ade Johnstad.  Fixes
        skolelinux bug #1196.
---
 cf/cfengine.conf | 4 +++-
 debian/changelog | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cf/cfengine.conf b/cf/cfengine.conf
index e013f9e..955099f 100644
--- a/cf/cfengine.conf
+++ b/cf/cfengine.conf
@@ -50,8 +50,10 @@ control:
         access                  = ( root ) 	# Who is allowed to run cfengine
         sysadm                  = ( root ) 	# Name or mail alias to sysadm
         editfilesize            = ( 150000 )    # Max size on textfiles that can be edited
-	ltsp_arch               = ( ExecResult(/bin/sh -c "if [ 'amd64' = $(/usr/bin/dpkg --print-architecture) ] ; then /bin/echo i386 ; else /usr/bin/dpkg --print-architecture ; fi") )
 
+        # Workaround for quote/parantesis problem with cfengine.  See #1196)
+        ltsp_arch_cmd           = ( `/bin/sh -c "if [ 'amd64' = $(/usr/bin/dpkg --print-architecture) ] ; then /bin/echo i386 ; else /usr/bin/dpkg --print-architecture ; fi"`)
+        ltsp_arch               = ( ExecResult('${ark}') )
 	
 	#
 	# Variables that defines some important cataloges
diff --git a/debian/changelog b/debian/changelog
index 2e3f048..bb5c843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 debian-edu-config (0.412.0.edu.etch.1+svn34863) terra; urgency=low
 
-  [ Ronny Aasen ]
-  * Fixed a bug in cfengine's ltsp_arch variable, that broke the installer.
+  [ Ronny Aasen and Petter Reinholdtsen ]
+  * Fixed a bug in cfengine's ltsp_arch variable, that broke the
+    installer.  Based on patch from Klaus Ade Johnstad.  Fixes
+    skolelinux bug #1196.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 19 Jun 2007 16:46:01 +0100
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git