From 6755285ccb55fc1f790e0a2c5202987acb52c98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Jul 2022 12:55:32 +0200 Subject: kernel-install: allow overriding the plugin list too The use of IFS= is dropped. Let's just iterate over the list, using any whitespace as separator. --- src/kernel-install/kernel-install.in | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'src/kernel-install') diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in index 96595fa295..30b28f4658 100755 --- a/src/kernel-install/kernel-install.in +++ b/src/kernel-install/kernel-install.in @@ -312,15 +312,20 @@ MAKE_ENTRY_DIR_ABS=$? ret=0 -PLUGINS="$( - dropindirs_sort ".install" \ - "/etc/kernel/install.d" \ - "/usr/lib/kernel/install.d" -)" -IFS=" -" +if [ -z "$KERNEL_INSTALL_PLUGINS" ]; then + KERNEL_INSTALL_PLUGINS="$( + dropindirs_sort ".install" \ + "/etc/kernel/install.d" \ + "/usr/lib/kernel/install.d" + )" +fi -[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && printf '%s\n' "Plugin files:" "$PLUGINS" +if [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ]; then + printf '%s\n' "Plugin files:" + for f in $KERNEL_INSTALL_PLUGINS; do + printf '%s\n' "$f" + done +fi case "$COMMAND" in add) @@ -346,7 +351,7 @@ case "$COMMAND" in fi fi - for f in $PLUGINS; do + for f in $KERNEL_INSTALL_PLUGINS; do [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "+$f add $KERNEL_VERSION $ENTRY_DIR_ABS" "$@" "$f" add "$KERNEL_VERSION" "$ENTRY_DIR_ABS" "$@" @@ -357,7 +362,7 @@ case "$COMMAND" in ;; remove) - for f in $PLUGINS; do + for f in $KERNEL_INSTALL_PLUGINS; do [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "+$f remove $KERNEL_VERSION $ENTRY_DIR_ABS" "$f" remove "$KERNEL_VERSION" "$ENTRY_DIR_ABS" err=$? -- cgit v1.2.1