Merge lp:~jamesodhunt/livecd-rootfs/ubuntu-core-configure-system-image-client.ini into lp:livecd-rootfs

[James Hunt]

* 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.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-24 10:00:39 +0000
+++ debian/changelog	2014-09-26 14:52:27 +0000
@@ -1,3 +1,11 @@
+livecd-rootfs (2.247) UNRELEASED; urgency=medium
+
+  * 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 <[e-mail]>  Fri, 26 Sep 2014 15:49:12 +0100
+
 livecd-rootfs (2.246) utopic; urgency=medium
 
   * live-build/auto/config: Use ubuntukylin-live task for ubuntukylin, not

=== added file 'live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot'
--- live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot	2014-09-26 14:52:27 +0000
@@ -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