Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-05 23:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.182 to ubuntu/saucy-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 647e5bbcb6bbd721c6fad04390a9d5a75ad62803

New changelog entries:
  * Log the hostname at the start of the build.
  * Fix test for whether we're running in the Canonical datacentre when
    installing click packages.
This commit is contained in:
Colin Watson 2013-09-05 16:03:15 +01:00 committed by usd-importer
parent 647e5bbcb6
commit 3fc5871d18
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.182) saucy; 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 <cjwatson@ubuntu.com> Thu, 05 Sep 2013 16:03:15 +0100
livecd-rootfs (2.181) saucy; urgency=low livecd-rootfs (2.181) saucy; urgency=low
* Use new multiple-database scheme in click 0.4.3 to preinstall click * Use new multiple-database scheme in click 0.4.3 to preinstall click

2
live-build/auto/config
View File

@ -3,6 +3,8 @@ set -e
rm -rf config rm -rf config
echo "Building on $(hostname --fqdn)"
SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/seeds/ SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/seeds/
if [ -z "$MIRROR" ]; then if [ -z "$MIRROR" ]; then
case $(hostname --fqdn) in case $(hostname --fqdn) in

2
live-build/ubuntu-touch/hooks/60-install-click.chroot
View File

@ -5,7 +5,7 @@ set -e
echo "Setting up click packages" echo "Setting up click packages"
case $(hostname --fqdn) in case $(hostname --fqdn) in
*.ubuntu.com) *.ubuntu.com|*.buildd)
click_uri=http://archive-team.internal/click_packages click_uri=http://archive-team.internal/click_packages
;; ;;
*) *)