From 52923f5f2a3890449d59aa8a251f9116ab260e7f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 5 Dec 2013 15:06:06 +0100 Subject: [PATCH] dracut-functions.sh: do not force require modules.builtin* (cherry picked from commit b29cb51654db13706c7356aa827e554456b25b0a) --- dracut-functions.sh | 7 ------- dracut.sh | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh index 0002556..8a0cd30 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1455,13 +1455,6 @@ dracut_kernel_post() { wait $_pid fi - for _f in modules.builtin.bin modules.builtin; do - [[ $srcmods/$_f ]] && break - done || { - dfatal "No modules.builtin.bin and modules.builtin found!" - return 1 - } - for _f in modules.builtin.bin modules.builtin modules.order; do [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" done diff --git a/dracut.sh b/dracut.sh index 7d5c9e0..f560dd1 100755 --- a/dracut.sh +++ b/dracut.sh @@ -518,7 +518,7 @@ if [[ $regenerate_all == "yes" ]]; then cd /lib/modules for i in *; do - [[ -f $i/modules.builtin ]] || continue + [[ -f $i/modules.dep ]] || [[ -f $i/modules.dep.bin ]] || continue dracut --kver="$i" "${dracut_args[@]}" ((ret+=$?)) done