diff --git a/debian/changelog b/debian/changelog index 4975f4d3..9d0d30b6 100644 --- a/debian/changelog +++ b/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 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: diff --git a/live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot b/live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot new file mode 100755 index 00000000..ef2d94c8 --- /dev/null +++ b/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 diff --git a/live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot b/live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot new file mode 100755 index 00000000..130ad28b --- /dev/null +++ b/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