diff options
| author | Harald Hoyer <harald@redhat.com> | 2010-07-27 11:51:27 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2010-07-27 11:51:27 +0200 |
| commit | bb7645459ed17564efb5f8e079c111d3cf9439f0 (patch) | |
| tree | 6f9fafa27a53dfacc8edee63710e1c88ac311bb9 /dracut-functions | |
| parent | e5c6cb2a8c0abc145b7322cb9c7a1927b8e07fd4 (diff) | |
| download | dracut-bb7645459ed17564efb5f8e079c111d3cf9439f0.tar.gz dracut-bb7645459ed17564efb5f8e079c111d3cf9439f0.tar.bz2 dracut-bb7645459ed17564efb5f8e079c111d3cf9439f0.zip | |
dracut-functions: fix "-m -a" handling
Diffstat (limited to 'dracut-functions')
| -rwxr-xr-x | dracut-functions | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/dracut-functions b/dracut-functions index 5e486bf7..40c4bef4 100755 --- a/dracut-functions +++ b/dracut-functions @@ -526,12 +526,20 @@ check_modules() { strstr "$mods_to_load" " $mod " && continue # This should never happen, but... [[ -d $moddir ]] || continue - [[ $dracutmodules != all ]] && ! strstr "$dracutmodules" "$mod" && \ - continue + strstr "$omit_dracutmodules" "$mod" && continue - if ! strstr "$add_dracutmodules" "$mod"; then - should_source_module "$moddir" || continue + + if ! strstr "$dracutmodules $add_dracutmodules" "$mod"; then + # module not in our list + if [[ $dracutmodules = all ]]; then + # check, if we can install this module + should_source_module "$moddir" || continue + else + # skip this module + continue + fi fi + mods_to_load+=" $mod " done |