Bug#775128: Kernel command line handling change breaks d-i user-params functionality

[jnqnfe]

Updated patch attached, fixing both syslinux and now also grub and grub2
now.

This should be applied on top of the three bug #775143 patches.

commit feb24f118094bc3baaa14728aa08a2a8abb08e91
Author: jnqnfe <jnq...@gmail.com>
Date:   Sun Jan 11 22:01:36 2015 +0000

    Change from -- to --- for kernel command line handling (Closes: #775128)

diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index cb1fb0f..ca6ac03 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -79,7 +79,7 @@ Grub_install_entry ()
        INITRD="${3}"
        APPEND="${4}"
 
-       QAPPEND="-- quiet"
+       QAPPEND="--- quiet"
 
        for TYPE in Install Expert Rescue Auto
        do
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index eda56f2..2835259 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -84,7 +84,7 @@ Grub_install_entry ()
 
        if [ "${LABEL}" != "expert" ] && [ "${LABEL}" != "expertgui" ]
        then
-               APPEND="${APPEND} -- quiet"
+               APPEND="${APPEND} --- quiet"
        fi
 
        LINUX_INSTALL="${LINUX_INSTALL}\nmenuentry \"Debian GNU/Linux - 
${LABEL}\" {"
diff --git a/share/bootloaders/extlinux/install.cfg 
b/share/bootloaders/extlinux/install.cfg
index 9177dd7..ba09752 100644
--- a/share/bootloaders/extlinux/install.cfg
+++ b/share/bootloaders/extlinux/install.cfg
@@ -2,10 +2,10 @@ label install
        menu label ^Install
        linux /install/vmlinuz
        initrd /install/initrd.gz
-       append vga=788 @APPEND_INSTALL@ -- quiet
+       append vga=788 @APPEND_INSTALL@ --- quiet
 
 label installgui
        menu label ^Graphical install
        linux /install/gtk/vmlinuz
        initrd /install/gtk/initrd.gz
-       append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
+       append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/isolinux/install.cfg 
b/share/bootloaders/isolinux/install.cfg
index 9177dd7..ba09752 100644
--- a/share/bootloaders/isolinux/install.cfg
+++ b/share/bootloaders/isolinux/install.cfg
@@ -2,10 +2,10 @@ label install
        menu label ^Install
        linux /install/vmlinuz
        initrd /install/initrd.gz
-       append vga=788 @APPEND_INSTALL@ -- quiet
+       append vga=788 @APPEND_INSTALL@ --- quiet
 
 label installgui
        menu label ^Graphical install
        linux /install/gtk/vmlinuz
        initrd /install/gtk/initrd.gz
-       append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
+       append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/pxelinux/install.cfg 
b/share/bootloaders/pxelinux/install.cfg
index 9177dd7..ba09752 100644
--- a/share/bootloaders/pxelinux/install.cfg
+++ b/share/bootloaders/pxelinux/install.cfg
@@ -2,10 +2,10 @@ label install
        menu label ^Install
        linux /install/vmlinuz
        initrd /install/initrd.gz
-       append vga=788 @APPEND_INSTALL@ -- quiet
+       append vga=788 @APPEND_INSTALL@ --- quiet
 
 label installgui
        menu label ^Graphical install
        linux /install/gtk/vmlinuz
        initrd /install/gtk/initrd.gz
-       append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
+       append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/syslinux/install.cfg 
b/share/bootloaders/syslinux/install.cfg
index 9177dd7..ba09752 100644
--- a/share/bootloaders/syslinux/install.cfg
+++ b/share/bootloaders/syslinux/install.cfg
@@ -2,10 +2,10 @@ label install
        menu label ^Install
        linux /install/vmlinuz
        initrd /install/initrd.gz
-       append vga=788 @APPEND_INSTALL@ -- quiet
+       append vga=788 @APPEND_INSTALL@ --- quiet
 
 label installgui
        menu label ^Graphical install
        linux /install/gtk/vmlinuz
        initrd /install/gtk/initrd.gz
-       append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
+       append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet