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

Import patches-unapplied version 2.497 to ubuntu/bionic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 9df196f7f13b1607f298278d2ea966baf86b272c

New changelog entries:
  * live-build/auto/config: Clean out unused hostname matches and fix indenting.
  * live-build/auto/config: Reinstate hostname filtering for "*.buildd", which
    is the correct match for non-lxd builders, and add "lp-*" for the lxd ones.
  * live-build/auto/config: Fix incorrect quoting causing a skipped if statement
    in non-live ubuntu-server builds since sometime in mid-October of last year.
This commit is contained in:
Adam Conrad 2018-01-31 20:54:54 -07:00 committed by usd-importer
parent 9df196f7f1
commit 8ea490e6a2
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.497) bionic; urgency=medium
* live-build/auto/config: Clean out unused hostname matches and fix indenting.
* live-build/auto/config: Reinstate hostname filtering for "*.buildd", which
is the correct match for non-lxd builders, and add "lp-*" for the lxd ones.
* live-build/auto/config: Fix incorrect quoting causing a skipped if statement
in non-live ubuntu-server builds since sometime in mid-October of last year.
-- Adam Conrad <adconrad@ubuntu.com> Wed, 31 Jan 2018 20:54:54 -0700
livecd-rootfs (2.496) bionic; urgency=medium livecd-rootfs (2.496) bionic; urgency=medium
* Update hostname matches for launchpad buildds to match current practice, * Update hostname matches for launchpad buildds to match current practice,

21
live-build/auto/config
View File

@ -8,13 +8,6 @@ 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
bld-*.mmjgroup.com) ;;
*.mmjgroup.com)
case $ARCH in
i386|amd64) MIRROR=http://archive.mmjgroup.com/ubuntu/ ;;
*) MIRROR=http://archive.mmjgroup.com/ubuntu-ports/ ;;
esac
;;
*.0c3.net) *.0c3.net)
case $ARCH in case $ARCH in
i386|amd64) MIRROR=http://mirrors.0c3.net/ubuntu/ ;; i386|amd64) MIRROR=http://mirrors.0c3.net/ubuntu/ ;;
@ -24,17 +17,17 @@ if [ -z "$MIRROR" ]; then
*.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/
SEEDMIRROR=http://archive-team.internal/seeds/ SEEDMIRROR=http://archive-team.internal/seeds/
;; ;;
*.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu/ *.buildd|lp-*) MIRROR=http://ftpmaster.internal/ubuntu/
SEEDMIRROR=http://archive-team.internal/seeds/ SEEDMIRROR=http://archive-team.internal/seeds/
;; ;;
*.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/ *.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/
SEEDMIRROR=http://archive-team.internal/seeds/ SEEDMIRROR=http://archive-team.internal/seeds/
;; ;;
*) case $ARCH in *) case $ARCH in
i386|amd64) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; i386|amd64) MIRROR=http://archive.ubuntu.com/ubuntu/ ;;
*) MIRROR=http://ports.ubuntu.com/ubuntu-ports ;; *) MIRROR=http://ports.ubuntu.com/ubuntu-ports/ ;;
esac esac
;; ;;
esac esac
fi fi
@ -878,7 +871,7 @@ EOF
;; ;;
esac esac
if [ $PROJECT = ubuntu-server ] && [ ${SUBPROJECT:-} != live ]; then if [ $PROJECT = ubuntu-server ] && [ "${SUBPROJECT:-}" != live ]; then
cat > config/hooks/100-remove-fstab.chroot <<EOF cat > config/hooks/100-remove-fstab.chroot <<EOF
#! /bin/sh #! /bin/sh
rm -f /etc/fstab rm -f /etc/fstab