Import patches-unapplied version 2.265 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 79f342f1d0

New changelog entries:
  * live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot:
    - only modify /etc/default/grub if the file exists

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.265) vivid; urgency=low
+
+  * live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot:
+    - only modify /etc/default/grub if the file exists
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 03 Nov 2014 17:10:57 +0100
+
 livecd-rootfs (2.264) vivid; urgency=low
 
   * live-build/auto/config:

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

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