Import patches-unapplied version 2.236 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 61e05b928d

New changelog entries:
  [ James Hunt ]
  * ubuntu-core:
    - Perform in-place edit.
    - Allow variable expansion.

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.236) utopic; urgency=medium
+
+  [ James Hunt ]
+  * ubuntu-core:
+    - Perform in-place edit.
+    - Allow variable expansion.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 05 Aug 2014 10:52:55 +0200
+
 livecd-rootfs (2.235) utopic; urgency=medium
 
   * Only add the ubuntu-core hooks for the system-image subproject.

live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot

@@ -3,7 +3,7 @@
 # Boot using systemd and disable quiet boot
 # to see what is happening.
 systemd=/lib/systemd/systemd
-sed \
-    -e 's,^\([ 	]*GRUB_CMDLINE_LINUX\)=""$,\1="init=$systemd",g' \
+sed -i \
+    -e "s,^\\([ 	]*GRUB_CMDLINE_LINUX\\)=\"\"$,\\1=\"init=$systemd\",g" \
     -e 's,^\([ 	]*GRUB_CMDLINE_LINUX_DEFAULT\)="quiet splash",\1="",g' \
     /etc/default/grub