From 63bd5b6bbf7b8bb6d6294825d132db67ce495ecc Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 6 Sep 2013 13:21:42 +0100 Subject: [PATCH] Import patches-unapplied version 2.184 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 15d4db023888b7035d54972413caa71ccc20ef8b New changelog entries: * Revert to always using archive-team.internal in 60-install-click.chroot for now. This is unfortunate, but "hostname --fqdn" doesn't work at this stage. --- debian/changelog | 8 ++++++++ live-build/ubuntu-touch/hooks/60-install-click.chroot | 11 ++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b005f9c..0793f633 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.184) saucy; urgency=low + + * Revert to always using archive-team.internal in 60-install-click.chroot + for now. This is unfortunate, but "hostname --fqdn" doesn't work at + this stage. + + -- Colin Watson Fri, 06 Sep 2013 13:21:42 +0100 + livecd-rootfs (2.183) saucy; urgency=low * Make 60-install-click.chroot more verbose, in an attempt to figure out diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index d8379642..6e29a364 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -1,17 +1,10 @@ #!/bin/sh -set -ex +set -e echo "Setting up click packages" -case $(hostname --fqdn) in - *.ubuntu.com|*.buildd) - click_uri=http://archive-team.internal/click_packages - ;; - *) - click_uri=http://people.canonical.com/~ubuntu-archive/click_packages - ;; -esac +click_uri=http://archive-team.internal/click_packages click_list=$click_uri/click_list click_db=/usr/share/click/preinstalled