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.
ubuntu/trusty
Colin Watson 12 years ago
parent 9f56629f09
commit 976cbb1594

8
debian/changelog vendored

@ -1,3 +1,11 @@
livecd-rootfs (2.184) UNRELEASED; 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 <cjwatson@ubuntu.com> Fri, 06 Sep 2013 13:21:08 +0100
livecd-rootfs (2.183) saucy; urgency=low livecd-rootfs (2.183) saucy; urgency=low
* Make 60-install-click.chroot more verbose, in an attempt to figure out * Make 60-install-click.chroot more verbose, in an attempt to figure out

@ -1,17 +1,10 @@
#!/bin/sh #!/bin/sh
set -ex set -e
echo "Setting up click packages" echo "Setting up click packages"
case $(hostname --fqdn) in click_uri=http://archive-team.internal/click_packages
*.ubuntu.com|*.buildd)
click_uri=http://archive-team.internal/click_packages
;;
*)
click_uri=http://people.canonical.com/~ubuntu-archive/click_packages
;;
esac
click_list=$click_uri/click_list click_list=$click_uri/click_list
click_db=/usr/share/click/preinstalled click_db=/usr/share/click/preinstalled

Loading…
Cancel
Save