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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-28 10:17:22 +0000 (Fri, 28 Jun 2013)
New Revision: 81235

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
Log:
Correct path to d-i PXE boot images used by our PXE setup when
using the debian-installer-7.0-netboot-i386 and
debian-installer-7.0-netboot-amd64 packages.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-28 10:10:45 UTC (rev 81234)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-28 10:17:22 UTC (rev 81235)
@@ -5,6 +5,9 @@
     automatic configuration failures.
   * Correct rsyslog test suite check to no look for the client
     configuration on the Main Server.
+  * Correct path to d-i PXE boot images used by our PXE setup when
+    using the debian-installer-7.0-netboot-i386 and
+    debian-installer-7.0-netboot-amd64 packages.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 28 Jun 2013 12:07:11 +0200
 

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-06-28 10:10:45 UTC (rev 81234)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-06-28 10:17:22 UTC (rev 81235)
@@ -132,10 +132,10 @@
 	    # Use the debian/installer netboot debs
             tarball=""
 	    if [ true = "$graphicdi" ]; then
-		ln -sf $di_img_dir/gtk $arch
+		ln -sf $di_img_dir/gtk/debian-installer/$arch $arch
 		gtkvideo="video=vesa:ywrap,mtrr"
 	    else
-		ln -sf $di_img_dir/text $arch
+		ln -sf $di_img_dir/text/debian-installer/$arch $arch
 	    fi
         elif [ ! -f netboot-$arch.tar.gz ] ; then
 	    if [ true = "$graphicdi" ]; then