summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh14
1 files changed, 4 insertions, 10 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 93f724f01..ccb756e34 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -21,14 +21,17 @@ Set_defaults ()
case "${LB_MODE}" in
progress)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-artax}"
+ LB_DERIVATIVE="true"
;;
ubuntu)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-karmic}"
+ LB_DERIVATIVE="false"
;;
*)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-squeeze}"
+ LB_DERIVATIVE="false"
;;
esac
@@ -367,7 +370,7 @@ Set_defaults ()
progress)
LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-${LB_PARENT_MIRROR_CHROOT}}"
- LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-${LB_MIRROR_CHROOT}}"
+ LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-none}"
;;
ubuntu)
@@ -530,15 +533,6 @@ Set_defaults ()
;;
esac
- if [ -z "${LB_REPOSITORIES}" ]
- then
- case "${LB_MODE}" in
- progress)
- LB_REPOSITORIES="progress-linux_${LB_DISTRIBUTION}"
- ;;
- esac
- fi
-
# Setting archive areas value
case "${LB_MODE}" in
ubuntu)