diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-02-14 14:32:10 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:20:43 +0100 |
| commit | ebf1ea52381c1af715b8e77cf06d609a22bf4ce0 (patch) | |
| tree | 6204dad935cc78f57300c6d81106514d36859ec1 /functions | |
| parent | ff807068b95f0b116338ee94a5da94823799e2aa (diff) | |
| download | vyos-live-build-ebf1ea52381c1af715b8e77cf06d609a22bf4ce0.tar.gz vyos-live-build-ebf1ea52381c1af715b8e77cf06d609a22bf4ce0.zip | |
Adding mirror handling for derivatives.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 14 |
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) |