From 5d707813f0a711ca58e3184d654c43bd1a292564 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Oct 2014 14:22:41 +0100 Subject: [PATCH] Move default click database configuration aside while installing click packages, otherwise click gets clever and stops us installing things into multiple databases. --- live-build/ubuntu-touch/hooks/60-install-click.chroot | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index daae6a14..626aad3b 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -16,8 +16,15 @@ chown clickpkg:clickpkg "$click_db" mkdir -p -m 755 "$click_db_custom" chown clickpkg:clickpkg "$click_db_custom" +# move default configuration aside to stop click being clever about symlink +# layering +mv /etc/click/databases /etc/click/databases.tmp + tmpdir="$(mktemp -d)" -cleanup () { rm -rf "$tmpdir"; } +cleanup () { + rm -rf "$tmpdir" + mv /etc/click/databases.tmp /etc/click/databases +} trap cleanup EXIT CLICKARCH=$(dpkg --print-architecture)