From: Pavel Valena Date: Fri, 24 Feb 2023 18:19:59 +0000 (+0100) Subject: fix(dracut.sh): kmoddir does not handle trailing / X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ddcb137ea2a4d79491ff94f1f7802dcaa7ac381;p=thirdparty%2Fdracut.git fix(dracut.sh): kmoddir does not handle trailing / Fixes https://github.com/dracutdevs/dracut/issues/2236 +(/) only works in bash interactive mode. Using any non-interactive bash run simply doesn't remove anything. The solution is copied from dracut-lib.sh, trim(). --- diff --git a/dracut.sh b/dracut.sh index 1aa3f8e1f..0c0f85c2d 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1033,7 +1033,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) ((stdloglvl < 0)) && stdloglvl=0 [[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l -drivers_dir="${drivers_dir%%+(/)}" +drivers_dir="${drivers_dir%"${drivers_dir##*[!/]}"}" [[ $do_strip_l ]] && do_strip=$do_strip_l [[ $do_strip ]] || do_strip=yes [[ $aggressive_strip_l ]] && aggressive_strip=$aggressive_strip_l