[debian-edu-commits] debian-edu/ 01/01: Revert "sbin/debian-edu-pxeinstall: Use the new location of the background image"

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit ab33df0b7385468b19fee32b4feef32e47cac048
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Dec 15 23:21:12 2016 +0100

    Revert "sbin/debian-edu-pxeinstall: Use the new location of the background image"
    
    This reverts commit b526558adcc2ac620ff0b381a06ee88972638f1d.
---
 debian/changelog           |  2 --
 sbin/debian-edu-pxeinstall | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f4b55c..7bdd933 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ debian-edu-config (1.920) UNRELEASED; urgency=medium
     to make the script work with old and new output of ifconfig.
     (Closes: #846847).
   * Add breaks to sitesummary (<< 0.1.26), thanks Petter.
-  * sbin/debian-edu-pxeinstall: Use the new location of the background
-    image and adjust the position of the menu entries for a better fit.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 05 Dec 2016 13:26:34 +0100
 
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index 7ed335c..b26b796 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -132,7 +132,7 @@ for arch in $archs ; do
         cd $tftpdir/debian-installer
 	di_ver=9
         tarball=""
-        if ! [ -d /usr/lib/debian-installer/images/$di_ver/$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=""
@@ -149,10 +149,10 @@ for arch in $archs ; do
                 url=$mirrorurl/dists/$dist/main/installer-$arch/current/images/netboot/gtk/netboot.tar.gz
                 gtkvideo="video=vesa:ywrap,mtrr vga=788"
             else
-                #url=$mirrorurl/dists/$dist/main/installer-$arch/current/images/netboot/netboot.tar.gz
+                url=$mirrorurl/dists/$dist/main/installer-$arch/current/images/netboot/netboot.tar.gz
                 # Comment the above URL and uncomment the below one to be able
                 # to fetch daily debian installer images during development.
-                url=https://d-i.debian.org/daily-images/$arch/daily/netboot/netboot.tar.gz
+                #url=https://d-i.debian.org/daily-images/$arch/daily/netboot/netboot.tar.gz
             fi
             echo "Fetching $url"
             if wget -q -O netboot-$arch.tar.gz.new $url ; then
@@ -192,7 +192,7 @@ d-i     mirror/ftp/proxy        string  $ftp_proxy
 #d-i     debian-edu-install/participate-popcon boolean true
 
 # If you want a specific set of profiles installed
-#d-i	debian-edu-install/profile multiselect Workstation, Thin-Client-Server
+#d-i	debian-edu-install/profile multiselect Workstation, LTSP-Server
 
 # If you want automatic partitioning
 #d-i	debian-edu-install/confirm boolean true
@@ -321,7 +321,7 @@ EOF
 
 ln -sf /usr/lib/PXELINUX/pxelinux.0 $tftpdir/pxelinux.0
 ln -sf /usr/lib/syslinux/modules/bios $tftpdir/syslinux
-ln -sf /usr/share/desktop-base/active-theme/grub/grub-4x3.png $tftpdir/debian-edu/debian-edu-pxe.png
+ln -sf /usr/share/images/desktop-base/debian-edu-pxe.png $tftpdir/debian-edu/debian-edu-pxe.png
 
 defaultfile=$tftpdir/debian-edu/default-menu.cfg
 echo "Generating $defaultfile"
@@ -343,7 +343,7 @@ menu color hotsel       1;7;37;40 #ffffffff #76a1d0ff *
 menu color tabmsg       * #ffffffff #00000000 *
 menu color help         37;40 #ffdddd00 #00000000 none
 
-menu vshift 4
+menu vshift 8
 menu rows 10
 menu hshift 13
 menu width 49

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