[debian-edu-commits] debian-edu/ 01/01: Adjust sbin/debian-edu-pxeinstall to work with debian-installer-8: - replace 8.0 with 8 as di version number. - replace '--' with '---' as param delimiter. (Closes: #776763).

[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 5df5b95908d9743df3e7a51b41560014a54b00a6
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Feb 1 14:17:25 2015 +0100

    Adjust sbin/debian-edu-pxeinstall to work with debian-installer-8: - replace 8.0 with 8 as di version number. - replace '--' with '---' as param delimiter. (Closes: #776763).
---
 debian/changelog           | 8 ++++++++
 sbin/debian-edu-pxeinstall | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 325eae1..b8f6d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-config (1.817) UNRELEASED; urgency=medium
+
+  * Adjust sbin/debian-edu-pxeinstall to work with debian-installer-8:
+    - replace 8.0 with 8 as di version number.
+    - replace '--' with '---' as param delimiter. (Closes: #776763).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 01 Feb 2015 14:09:04 +0100
+
 debian-edu-config (1.816) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index 4d5df0b..02b440a 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -131,7 +131,7 @@ for arch in $archs ; do
 	[ -d $tftpdir/debian-installer ] || \
 	    mkdir $tftpdir/debian-installer
         cd $tftpdir/debian-installer
-	di_ver=8.0
+	di_ver=8
         tarball=""
         if [ -d /usr/lib/debian-installer/images/$di_ver/$arch ]; then
 	    di_img_dir="/usr/lib/debian-installer/images/$di_ver/$arch"
@@ -274,7 +274,7 @@ echo "Generating $menufile"
 LABEL neteduboot-$arch
         MENU LABEL Install Edu/^$arch ($desktop)
         kernel debian-installer/$arch/linux
-        append $gtkvideo initrd=debian-installer/$arch/initrd.gz auto url=$preseedurl hostname=$hostname domain=$domain $installconfig -- quiet
+        append $gtkvideo initrd=debian-installer/$arch/initrd.gz auto url=$preseedurl hostname=$hostname domain=$domain $installconfig --- quiet
 	ipappend 2
 include menupassword.cfg
 

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