[debian-edu-commits] debian-edu/ 02/04: [ Petter Reinholdtsen ] * Update ltsp testsuite to use i386 on amd64 systems to fix skolelinux bug #1200.

[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+svn34952
in repository debian-edu-config.

commit 9e49fd4f445261681157e80997951f151cc782bb
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Jun 22 16:59:48 2007 +0000

      [ Petter Reinholdtsen ]
      * Update ltsp testsuite to use i386 on amd64 systems to fix
        skolelinux bug #1200.
---
 debian/changelog |  4 ++++
 testsuite/ltsp   | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1dd647..e49f098 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ debian-edu-config (0.412.0.edu.etch.1+svn34885) unstable; urgency=low
   [ Klaus Ade Johnstad ]
   * Fixed typo introduced in fix for skolelinux bug #1196
 
+  [ Petter Reinholdtsen ]
+  * Update ltsp testsuite to use i386 on amd64 systems to fix
+    skolelinux bug #1200.
+
  -- Klaus Ade Johnstad <klaus at skolelinux.no>  Wed, 20 Jun 2007 00:06:58 +0200
 
 debian-edu-config (0.412) unstable; urgency=low
diff --git a/testsuite/ltsp b/testsuite/ltsp
index 90e9b80..50e1713 100755
--- a/testsuite/ltsp
+++ b/testsuite/ltsp
@@ -2,7 +2,11 @@
 #
 # Check the LTSP installation.
 
-ARCH=`dpkg --print-installation-architecture`
+LTSPARCH=`dpkg --print-installation-architecture`
+
+if [ amd64 = "$LTSPARCH" ] ; then
+    LTSPARCH=i386
+fi
 
 PROFILE=
 if test -r /etc/debian-edu/config ; then
@@ -10,9 +14,9 @@ if test -r /etc/debian-edu/config ; then
 fi
 
 if echo "$PROFILE" | grep -q Thin-Client-Server ; then
-    if [ -d /opt/ltsp/$ARCH/etc ] ; then
+    if [ -d /opt/ltsp/$LTSPARCH/etc ] ; then
 	echo "success: Found LTSP chroot"
     else
-	echo "error: LTSP chroot is missing in /opt/ltsp/$ARCH/"
+	echo "error: LTSP chroot is missing in /opt/ltsp/$LTSPARCH/"
     fi
 fi

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