Updating some defaults for progress.

This commit is contained in:
Daniel Baumann 2011-01-07 21:18:27 +01:00
parent d0a5dac971
commit 8f4fb88a71
1 changed files with 16 additions and 12 deletions

View File

@ -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