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

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-04-29 09:17:54 +0000 (Mon, 29 Apr 2013)
New Revision: 79839

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
Log:
sbin/debian-edu-pxeinstall: Set distribution string to wheezy to let
pxe installations take the right udebs while doing test-installs.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-29 05:13:01 UTC (rev 79838)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-29 09:17:54 UTC (rev 79839)
@@ -11,6 +11,8 @@
   * ltsp/init-ltsp.d/60-edu-diskless-ws: Add 'dhclient -nw' to fix the
     proxy setting in /etc/environment, cause the proxy setting hook
     scripts expect dhclient to run.
+  * sbin/debian-edu-pxeinstall: Set distribution string to wheezy to let
+    pxe installations take the right udebs while doing test-installs.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 27 Apr 2013 20:15:38 +0200
 

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-04-29 05:13:01 UTC (rev 79838)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-04-29 09:17:54 UTC (rev 79839)
@@ -198,14 +198,14 @@
 EOF
     debconf-get-selections --installer | grep -w 'time/zone'
 
-    if [ squeeze = "$dist" ] ; then
+    if [ wheezy = "$dist" ] ; then
 	# FIXME check if this workaround is still needed.  It is
 	# needed when the udebs we want to use during installation are
 	# newer in our repository than in the official Debian
 	# repository.
         cat <<EOF
 
-# Workaround for old udebs in Debian/Squeeze
+# Workaround for old udebs in Debian/Wheezy
 d-i     preseed/early_command   string  anna-install dmidecode-udeb; export http_proxy="$http_proxy"; cd /tmp; archiveurl=$archiveurl; arch=i386; wget \$archiveurl/dists/$edudist/local/debian-installer/binary-\$arch/Packages; packages_file=Packages; desired_udebs="debian-edu-profile-udeb"; for file in \$(grep 'Filename:' \$packages_file | cut -d : -f 2); do udeb=\$(basename \$file | cut -d _ -f 1); for u in \$desired_udebs ; do if [ "\$u" = "\$udeb" ]; then url="\$archiveurl/\$file"; echo "info: Trying to fetch and install \$url"; if wget \$url; then udpkg --unpack \$(basename \$file); else echo "error: Unable to download \$url"; fi; break; fi; done; done; if [ -z "\$url" ] ; then echo "error: Unable to find updated udebs"; fi
 EOF
     fi