Bug#775143: grub/grub2 kernel parameter bugs

[jnqnfe]

Additional commit attached to correct the order of appending user
supplied params in grub/grub2 live menu entries, allowing user params to
override defaults.

commit 19f3b1127309bb4cb867f5c4db90fc25fd2cd90a
Author: jnqnfe <jnq...@gmail.com>
Date:   Tue Jan 13 00:58:35 2015 +0000

    Reverse order of user kernel parameter appendage with grub/grub2 live 
entries
    
    Allows user supplied params to possibly override defaults.

diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index 55ce680..c38ac18 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -68,7 +68,7 @@ Grub_live_entry ()
        APPEND="${4}"
 
        LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
-       LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} 
${INITFS:+boot=${INITFS} }config LB_BOOTAPPEND_LIVE ${APPEND}"
+       LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} 
${INITFS:+boot=${INITFS} }config ${APPEND} LB_BOOTAPPEND_LIVE"
        LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
 }
 
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index fe36f11..61e8169 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -68,7 +68,7 @@ Grub_live_entry ()
        APPEND="${4}"
 
        LINUX_LIVE="${LINUX_LIVE}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
-       LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} ${INITFS:+boot=${INITFS} 
}config LB_BOOTAPPEND_LIVE ${APPEND}"
+       LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} ${INITFS:+boot=${INITFS} 
}config ${APPEND} LB_BOOTAPPEND_LIVE"
        LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
        LINUX_LIVE="${LINUX_LIVE}\n}"
 }