[debian-edu-commits] debian-edu/ 01/01: Adjust PXE installation arguments to put all d-i arguments before the -- on the kernel argument line.

[Petter Reinholdtsen]

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

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

commit 46f7c59254a69b27c174684161190e89e5b68301
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Oct 9 22:00:33 2014 +0200

    Adjust PXE installation arguments to put all d-i arguments before the -- on the kernel argument line.
---
 debian/changelog           | 2 ++
 sbin/debian-edu-pxeinstall | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ec3cd34..90c83d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
     to be fetched from the preseed file.
   * Add new tool package-disk-usage to list how much disk space the
     installed packages uses.
+  * Adjust PXE installation arguments to put all d-i arguments before
+    the -- on the kernel argument line.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 07 Oct 2014 12:47:06 +0200
 
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index e1fc013..c1682f4 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -272,7 +272,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 -- quiet auto url=$preseedurl hostname=$hostname domain=$domain $installconfig
+        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