From 2a94ca69ce869194f750fe3a4644af5d615b38ce Mon Sep 17 00:00:00 2001
From: Ian Southam <isoutham@schubergphilis.com>
Date: Mon, 4 Aug 2014 14:06:05 +0200
Subject: [PATCH] Added some lost lines back using Hugo witchcraft

---
 .../patches/debian/config/etc/init.d/cloud-early-config  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 369ead814f4..76e6e94011a 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1339,13 +1339,17 @@ VM_PASSWORD=""
 CHEF_TMP_FILE=/tmp/cmdline.json
 COMMA="\t"
 echo -e "{\n\"id\": \"cmdline\"," > ${CHEF_TMP_FILE}
-echo -e "{\n\"cmdline\": {" > ${CHEF_TMP_FILE}
+echo -e "\n\"cmd_line\": {" >> ${CHEF_TMP_FILE}
 
 for i in $CMDLINE
   do
     # search for foo=bar pattern and cut out foo
     KEY=$(echo $i | cut -d= -f1)
     VALUE=$(echo $i | cut -d= -f2)
+    echo -en ${COMMA} >> ${CHEF_TMP_FILE}
+    # Two lines so values do not accidently interpretted as escapes!!
+    echo -n \"${KEY}\"': '\"${VALUE}\" >> ${CHEF_TMP_FILE}
+    COMMA=",\n\t"
     case $KEY in 
       disable_rp_filter)
           DISABLE_RP_FILTER=$VALUE
@@ -1484,11 +1488,10 @@ for i in $CMDLINE
         ;;
     esac
 done
-
 echo -e "\n\t}\n}" >> ${CHEF_TMP_FILE}
 if [ "$TYPE" != "unknown" ]
 then
-	mv ${CHEF_TMP_FILE} /var/chef/data_bags/vr/cmdline.json
+	mv ${CHEF_TMP_FILE} /var/chef/data_bags/vr/cmd_line.json
 fi
 
 [ $ETH0_IP ] && LOCAL_ADDRS=$ETH0_IP