[debian-edu-commits] r79320 - in branches/wheezy/debian-edu-config: debian sbin

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-03-08 15:26:54 +0000 (Fri, 08 Mar 2013)
New Revision: 79320

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-ltsp
Log:
debian-edu-ltsp: Add workaround to fix ltsp chroot installation. 

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-03-08 05:58:09 UTC (rev 79319)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-03-08 15:26:54 UTC (rev 79320)
@@ -1,3 +1,9 @@
+debian-edu-config (1.703~svn79150+nmu1) UNRELEASED; urgency=low
+
+  * debian-edu-ltsp: Add workaround to fix ltsp chroot installation. 
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 08 Mar 2013 16:09:23 +0100
+
 debian-edu-config (1.703~svn79150) wheezy-test; urgency=low
 
   [ Wolfgang Schweer ]

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-ltsp
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-ltsp	2013-03-08 05:58:09 UTC (rev 79319)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-ltsp	2013-03-08 15:26:54 UTC (rev 79320)
@@ -36,7 +36,7 @@
 export LC_ALL
 
 test "$base" || base=/opt/ltsp
-test "$dist" || dist=squeeze
+test "$dist" || dist=wheezy
 
 if [ -d $base/$ARCH ] ; then
     echo "error: $base/$ARCH already exist.  Remove it before running $0"
@@ -91,13 +91,20 @@
 fi
 
 # Build LTSP chroot, fetch packages from default APT sources
-ltsp-build-client \
+# FIXME: Added ugly workaround to let installation succeed in case the
+# dictionaries-common problem occurs.
+if ltsp-build-client \
   $ltspopts \
   --mirror $mirror \
   --dist $dist \
   --components "$components" \
   --security-mirror "$securitymirror" \
-  --extra-mirror "$extramirror"
+  --extra-mirror "$extramirror" ; then
+  :
+  else
+  /usr/share/debconf/fix_db.pl
+  dpkg --configure -a
+fi
 
 #populate /var/lib/tftpboot with kernel images and pxelinux configuration
 if [ -f /usr/sbin/ltsp-update-kernels ] ; then