From 2ebe770e4175a3cedd8fec12a0594d1e7bb7684b Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Tue, 15 Jan 2008 19:45:07 +0000
Subject: Refactor d-i udeb handling with better failure mode (Closes: #444565)
---
helpers/lh_binary_debian-installer | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 9522bab..4b36ffa 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
--
cgit v1.0