diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-27 23:29:19 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-27 23:29:19 +0200 |
| commit | a16be4ab5e706f07997de6c03d4edd35537368c4 (patch) | |
| tree | c2b8e31afc74291f50ce7b2ae8715e52326e01cc /functions | |
| parent | 825f24f97dd85f1b80a9050126a22fc866583364 (diff) | |
| download | vyos-live-build-a16be4ab5e706f07997de6c03d4edd35537368c4.tar.gz vyos-live-build-a16be4ab5e706f07997de6c03d4edd35537368c4.zip | |
Updating all distribution specific selectors in defaults to be as future proof as possible.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 31 | ||||
| -rwxr-xr-x | functions/echo.sh | 4 |
2 files changed, 20 insertions, 15 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index c9b9e00fe..f194a8b48 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -56,7 +56,7 @@ Set_defaults () ;; ubuntu|kubuntu) - LB_DISTRIBUTION="${LB_DISTRIBUTION:-oneiric}" + LB_DISTRIBUTION="${LB_DISTRIBUTION:-precise}" LB_DERIVATIVE="false" ;; @@ -81,6 +81,11 @@ Set_defaults () ;; baureo) + LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-wheezy}" + LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" + ;; + + charon) LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}" LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" ;; @@ -293,7 +298,7 @@ Set_defaults () fi # Setting tasksel - case "${LB_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION}" in squeeze) LB_TASKSEL="${LB_TASKSEL:-tasksel}" ;; @@ -748,13 +753,13 @@ Set_defaults () ;; *) - case "${LB_DISTRIBUTION}" in - wheezy|sid) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}" + case "${LB_PARENT_DISTRIBUTION}" in + squeeze) + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}" ;; *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}" + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}" ;; esac ;; @@ -848,8 +853,8 @@ Set_defaults () ;; *) - case "${LB_DISTRIBUTION}" in - squeeze|artax) + case "${LB_PARENT_DISTRIBUTION}" in + squeeze) LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image-2.6}" ;; @@ -864,8 +869,8 @@ Set_defaults () LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS:-standard}" # Setting security updates option - case "${LB_DISTRIBUTION}" in - wheezy|sid|precise) + case "${LB_PARENT_DISTRIBUTION}" in + jessie|sid) LB_SECURITY="${LB_SECURITY:-false}" ;; @@ -875,8 +880,8 @@ Set_defaults () esac # Setting volatile updates option - case "${LB_DISTRIBUTION}" in - wheezy|sid|precise) + case "${LB_PARENT_DISTRIBUTION}" in + jessie|sid) LB_VOLATILE="${LB_VOLATILE:-false}" ;; @@ -948,7 +953,7 @@ Set_defaults () ;; *) - case "${LB_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION}" in squeeze) LB_COMPRESSION="${LB_COMPRESSION:-gzip}" ;; diff --git a/functions/echo.sh b/functions/echo.sh index fa6b888a1..9daabd1a8 100755 --- a/functions/echo.sh +++ b/functions/echo.sh @@ -193,8 +193,8 @@ Echo_file () Echo_breakage () { - case "${LB_DISTRIBUTION}" in - sid|unstable) + case "${LB_PARENT_DISTRIBUTION}" in + sid) Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration, a caching proxy or the sid distribution." ;; *) |