From 1c5ea38bebcb423b486422842d7ac9e5fad20cef Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 5 Sep 2013 16:03:10 +0100 Subject: [PATCH] Fix test for whether we're running in the Canonical datacentre when installing click packages. --- debian/changelog | 2 ++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0df5fd24..33e5c1ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ livecd-rootfs (2.182) UNRELEASED; urgency=low * Log the hostname at the start of the build. + * Fix test for whether we're running in the Canonical datacentre when + installing click packages. -- Colin Watson Thu, 05 Sep 2013 16:02:13 +0100 diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index bb4c0008..74928239 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -5,7 +5,7 @@ set -e echo "Setting up click packages" case $(hostname --fqdn) in - *.ubuntu.com) + *.ubuntu.com|*.buildd) click_uri=http://archive-team.internal/click_packages ;; *)