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

Imported using git-ubuntu import.

Changelog parent: 720ff888d3

New changelog entries:
  * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Configure
    resolv.conf for Ubuntu Core. 
  * live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot:
    Configure system-image-cli's client.ini for Ubuntu Core. This can be
    dropped once bug 1373467 is fixed.

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (2.248) utopic; urgency=medium
+
+  * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Configure
+    resolv.conf for Ubuntu Core. 
+  * live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot:
+    Configure system-image-cli's client.ini for Ubuntu Core. This can be
+    dropped once bug 1373467 is fixed.
+
+ -- James Hunt <james.hunt@ubuntu.com>  Fri, 03 Oct 2014 15:23:47 +0100
+
 livecd-rootfs (2.247) utopic; urgency=medium
 
   * live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early:

live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot

@@ -0,0 +1,3 @@
+#!/bin/sh -x
+
+ln -s /run/resolvconf/resolv.conf /etc/resolv.conf

live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot

@@ -0,0 +1,7 @@
+#!/bin/sh -x
+
+# Change default cache partition (until LP: #1373467 is fixed).
+if [ -f /etc/system-image/client.ini ]; then
+	sed -ie 's!cache_partition: /android/cache/recovery!cache_partition: /userdata/cache!g' \
+			/etc/system-image/client.ini
+fi