From 9b47bee920952d8063fdbf8c7f143789577de66c Mon Sep 17 00:00:00 2001
From: Kai Hendry <hendry@webconverger.com>
Date: Wed, 28 Nov 2012 08:27:51 +0000
Subject: [PATCH] Fixes #107 to disallow breaking install boot

---
 etc/webc/functions.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/etc/webc/functions.sh b/etc/webc/functions.sh
index 84ba7e539d..06948c834c 100644
--- a/etc/webc/functions.sh
+++ b/etc/webc/functions.sh
@@ -192,20 +192,18 @@ generate_installed_config()
 	# Extract the kernel and initrd from git
 	extract_kernel "${dir}/live" "${flavour}" "" "${git_repo}" "${git_revision}" || return 1
 
+	cmdline_has noescape && noescape="noescape 1"
+
 	# Generate global extlinux config file
 	cat<<EOF > ${dir}/boot/extlinux/extlinux.conf
 default linux
 prompt 0
-
-include linux.cfg
-EOF
-
-	# Generate config entry to boot our selected flavour
-	cat<<EOF > ${dir}/boot/extlinux/linux.cfg
+${noescape}
 label linux
-	linux    /live/vmlinuz
-	append   initrd=/live/initrd.img ${bootparams}
+linux    /live/vmlinuz
+append   initrd=/live/initrd.img ${bootparams}
 EOF
+
 }
 
 # vim: set sw=8 sts=8 noexpandtab: