summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-01-07 21:18:27 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:20:41 +0100
commit8f4fb88a7161d924be52587d24087a4f10d60a75 (patch)
tree94d0af40aeb68c269e093d7e1b55c818836a07ff
parentd0a5dac9713f2031383fed1d78130ef770d891b6 (diff)
downloadvyos-live-build-8f4fb88a7161d924be52587d24087a4f10d60a75.tar.gz
vyos-live-build-8f4fb88a7161d924be52587d24087a4f10d60a75.zip
Updating some defaults for progress.
-rwxr-xr-xfunctions/defaults.sh28
1 files changed, 16 insertions, 12 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 229937057..9e4f8415a 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -257,7 +257,7 @@ Set_defaults ()
# Setting mirror to fetch packages from
case "${LB_MODE}" in
- debian|progress)
+ debian)
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://ftp.de.debian.org/debian/}"
;;
@@ -265,6 +265,10 @@ Set_defaults ()
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://buildd.emdebian.org/grip/}"
;;
+ progress)
+ LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.debian.net/debian/}"
+ ;;
+
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
@@ -282,7 +286,7 @@ Set_defaults ()
# Setting security mirror to fetch packages from
case "${LB_MODE}" in
- debian|progress)
+ debian)
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
;;
@@ -290,6 +294,10 @@ Set_defaults ()
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-none}"
;;
+ progress)
+ LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://cdn.debian.net/debian-security/}"
+ ;;
+
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
@@ -362,7 +370,7 @@ Set_defaults ()
# Setting security mirror which ends up in the image
case "${LB_MODE}" in
- debian|progress)
+ debian)
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
;;
@@ -370,6 +378,10 @@ Set_defaults ()
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-none}"
;;
+ progress)
+ LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://cdn.debian.net/debian-security/}"
+ ;;
+
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
@@ -819,15 +831,7 @@ Set_defaults ()
# LB_GRUB_SPLASH
# Setting hostname
- case "${LB_MODE}" in
- debian)
- LB_HOSTNAME="${LB_HOSTNAME:-debian}"
- ;;
-
- *)
- LB_HOSTNAME="${LB_HOSTNAME:-${LB_MODE}}"
- ;;
- esac
+ LB_HOSTNAME="${LB_HOSTNAME:-${LB_MODE}}"
# Setting iso author
case "${LB_MODE}" in