diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-01-15 19:45:07 +0000 |
|---|---|---|
| committer | Chris Lamb <chris@chris-lamb.co.uk> | 2008-01-15 19:45:07 +0000 |
| commit | 73acaf73d3539471b0270a5c54b59a245b5fd85b (patch) | |
| tree | ba2bc7b808bbd0373c2aba5f972df937a87aa690 | |
| parent | 1f436f74835771e6a695fdb93f4dd31fbc38a13a (diff) | |
| download | vyos-live-build-73acaf73d3539471b0270a5c54b59a245b5fd85b.tar.gz vyos-live-build-73acaf73d3539471b0270a5c54b59a245b5fd85b.zip | |
Refactor d-i udeb handling with better failure mode (Closes: #444565)
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 9522bab1b..4b36ffa21 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -323,9 +323,9 @@ mkdir -p ../cache/packages_debian-installer.udeb cp *.udeb ../cache/packages_debian-installer.udeb # Including local udebs -if ls ../config/binary_local-udebs/*.udeb > /dev/null 2>&1 +if ls ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb > /dev/null 2>&1 then - for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb ../config/binary_local-udebs/*_all.udeb + for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb do Install_file "${FILE}" "pool/main" @@ -333,7 +333,16 @@ then rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb done fi +if ls ../config/binary_local-udebs/*_all.udeb > /dev/null 2>&1 +then + for FILE in ../config/binary_local-udebs/*_all.udeb + do + Install_file "${FILE}" "pool/main" + # Prefer local udebs over downloaded udebs + rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb + done +fi # Excluding udebs grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/udeb_exclude > exclude grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs >> exclude |