From 5b99f78331f567cc1442460efc054b72c45306a6 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 26 May 2012 15:42:37 -0400 Subject: functions: avoid adding nonexistant modules to config If we didn't actually add a module to the image, avoid adding it to the runtime config for probing. Signed-off-by: Dave Reisner --- functions | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/functions b/functions index 262a08a..14c6637 100644 --- a/functions +++ b/functions @@ -590,8 +590,12 @@ write_image_config() { . "$CONFIG" # sanitize of any extra whitespace - read -r -a modules <<< "$MODULES" - (( ${#modules[*]} )) && printf 'MODULES="%s"\n' "${modules[*]%\?}" + read -ra modules <<< "$MODULES" + for mod in "${modules[@]}"; do + in_array "${mod%\?}" "${ADDED_MODULES[@]}" || continue + add+=("${mod%\?}") + done + (( ${#add[*]} )) && printf 'MODULES="%s"\n' "${add[*]}" printf '%s="%s"\n' \ 'EARLYHOOKS' "${RUNHOOKS['early']# }" \ -- cgit v1.2.3-24-g4f1b