Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-14 19:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge redundant cases for seed/mirror handling

Browse Source
This commit is contained in:
Steve Langasek 2023-09-06 11:43:11 -07:00
parent caace43cb9
commit f44c2aac8c
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -8,6 +8,7 @@ livecd-rootfs (23.10.33) UNRELEASED; urgency=medium
* Drop references to ubuntu-netbook, obsolete since Ubuntu 11.04. * Drop references to ubuntu-netbook, obsolete since Ubuntu 11.04.
* ubuntu-unity-live task exists, use it also instead of hard-coded list of * ubuntu-unity-live task exists, use it also instead of hard-coded list of
packages. packages.
* live-build/auto/config: various refactors to eliminate code duplication
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 06 Sep 2023 11:23:17 -0700 -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 06 Sep 2023 11:23:17 -0700

12
live-build/auto/config
View File

@ -15,16 +15,12 @@ echo "Building on $(hostname --fqdn)"
SEEDMIRROR=https://ubuntu-archive-team.ubuntu.com/seeds/ SEEDMIRROR=https://ubuntu-archive-team.ubuntu.com/seeds/
if [ -z "$MIRROR" ]; then if [ -z "$MIRROR" ]; then
case $(hostname --fqdn) in case $(hostname --fqdn) in
*.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ *.ubuntu.com|*.buildd|*.ppa|*.scalingstack)
MIRROR=http://ftpmaster.internal/ubuntu/
SEEDMIRROR=http://archive-team.internal/seeds/ SEEDMIRROR=http://archive-team.internal/seeds/
;; ;;
*.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ *)
SEEDMIRROR=http://archive-team.internal/seeds/ case $ARCH in
;;
*.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/
SEEDMIRROR=http://archive-team.internal/seeds/
;;
*) 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