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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-21 18:42:39 +0000 (Fri, 21 Jun 2013)
New Revision: 81059

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
Log:
Adjust debian-edu-pxeinstall paths to be compatible with
debian-installer-7.0-netboot-i386 and
debian-installer-7.0-netboot-amd64.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-21 18:17:44 UTC (rev 81058)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-21 18:42:39 UTC (rev 81059)
@@ -1,5 +1,10 @@
 debian-edu-config (1.707~svn80890) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
+   * Adjust debian-edu-pxeinstall paths to be compatible with
+     debian-installer-7.0-netboot-i386 and
+     debian-installer-7.0-netboot-amd64.
+
    * Debconf translation updates:
      - add Polish, thanks to Michał Kułach. (Closes: #712723)
 

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-06-21 18:17:44 UTC (rev 81058)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-06-21 18:42:39 UTC (rev 81059)
@@ -125,15 +125,17 @@
 	[ -d $tftpdir/debian-installer ] || \
 	    mkdir $tftpdir/debian-installer
         cd $tftpdir/debian-installer
+	di_ver=7.0
         tarball=""
-        if [ -d /usr/lib/debian-installer/images/$arch ]; then
+        if [ -d /usr/lib/debian-installer/images/$di_ver/$arch ]; then
+	    di_img_dir="/usr/lib/debian-installer/images/$di_ver/$arch"
 	    # Use the debian/installer netboot debs
             tarball=""
 	    if [ true = "$graphicdi" ]; then
-		ln -sf /usr/lib/debian-installer/images/$arch/gtk $arch
+		ln -sf $di_img_dir/gtk $arch
 		gtkvideo="video=vesa:ywrap,mtrr"
 	    else
-		ln -sf /usr/lib/debian-installer/images/$arch/text $arch
+		ln -sf $di_img_dir/text $arch
 	    fi
         elif [ ! -f netboot-$arch.tar.gz ] ; then
 	    if [ true = "$graphicdi" ]; then