Bug#630080: some Ubuntu mirror defaults are incorrect
Package: live-build
Version: 3.0~a18-1
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch oneiric
Standard practice in Ubuntu is to use security.ubuntu.com for *-security
and archive.ubuntu.com for *-updates (the latter of which is "volatile"
in live-build terms, although that's really a pretty inaccurate
mapping). However, live-build has the defaults the wrong way round in a
few places, leading to this sources.list in the binary image:
deb http://archive.ubuntu.com/ubuntu/ natty main restricted
deb http://archive.ubuntu.com/ubuntu/ natty-security main restricted
deb http://security.ubuntu.com/ubuntu/ natty-updates main restricted
That's just weird. I would expect:
deb http://archive.ubuntu.com/ubuntu/ natty main restricted
deb http://security.ubuntu.com/ubuntu/ natty-security main restricted
deb http://archive.ubuntu.com/ubuntu/ natty-updates main restricted
The attached patch fixes the defaults.
Thanks,
--
Colin Watson [cjwatson@ubuntu.com]
>From 179b4f3635e9922783773b3e378fd61a28efbb0f Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Fri, 10 Jun 2011 17:41:07 +0100
Subject: [PATCH] Fix incorrect Ubuntu defaults for security and volatile
mirrors.
---
functions/defaults.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5375475..0e6a34c 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -385,7 +385,7 @@ Set_defaults ()
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
- LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://security.ubuntu.com/ubuntu/}";
+ LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://archive.ubuntu.com/ubuntu/}";
;;
*)
@@ -471,7 +471,7 @@ Set_defaults ()
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
- LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://archive.ubuntu.com/ubuntu/}";
+ LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}";
;;
*)
@@ -498,7 +498,7 @@ Set_defaults ()
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
- LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://security.ubuntu.com/ubuntu/}";
+ LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://archive.ubuntu.com/ubuntu/}";
;;
*)
--
1.7.5.3
Reply to: