diff options
| author | Colin Watson <cjwatson@canonical.com> | 2011-06-14 12:14:14 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-14 12:14:22 +0200 |
| commit | 65ac1c651c517deb260389b8b9c374741a594bbd (patch) | |
| tree | 0043369547f435ecb95056a1c872491dfdc267fc /functions | |
| parent | 21dfadb6225968fb960510f6fc04904f93b204b1 (diff) | |
| download | vyos-live-build-65ac1c651c517deb260389b8b9c374741a594bbd.tar.gz vyos-live-build-65ac1c651c517deb260389b8b9c374741a594bbd.zip | |
Make --architectures armel only fail if --linux-flavours was not passed (Closes: #630464).
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 4379704ff..67b34e43a 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -593,9 +593,12 @@ Set_defaults () # Setting linux flavour string case "${LB_ARCHITECTURES}" in armel) - Echo_error "There is no default kernel flavour defined for your architecture." - Echo_error "Please configure it manually with 'lb config -k FLAVOUR'." - exit 1 + if [ -z "${LB_LINUX_FLAVOURS}" ] + then + Echo_error "There is no default kernel flavour defined for your architecture." + Echo_error "Please configure it manually with 'lb config -k FLAVOUR'." + exit 1 + fi ;; amd64) |