Skip to content

Commit 6c4187a

Browse files
Merge pull request dracutdevs#86 from mwilck/fix-bsc1189895
fix(suse-initrd): handle cases with zero modprobe.d files
2 parents e5fc204 + 145ca72 commit 6c4187a

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

modules.d/99suse-initrd/module-setup.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
# called by dracut
1111
check() {
1212
# Skip the module if no SUSE INITRD is used
13-
grep -q "^# SUSE INITRD: " $(get_modprobe_conf_files)
13+
local conf_files=$(get_modprobe_conf_files)
14+
[[ $conf_files ]] && grep -q "^# SUSE INITRD: " $conf_files
1415
}
1516

1617
get_modprobe_conf_files() {
@@ -20,6 +21,11 @@ get_modprobe_conf_files() {
2021
return 0
2122
}
2223

24+
get_suse_initrd_lines() {
25+
local conf_files=$(get_modprobe_conf_files)
26+
[[ -z "$conf_files" ]] || grep -h "^# SUSE INITRD: " $conf_files
27+
}
28+
2329
read_initrd_modules() {
2430
if [[ -f /etc/sysconfig/kernel ]]; then
2531
INITRD_MODULES=
@@ -47,7 +53,7 @@ installkernel() {
4753
then
4854
all_mods="$all_mods $(filter_builtin $reqs)"
4955
fi
50-
done <<< "$(grep -h "^# SUSE INITRD: " $(get_modprobe_conf_files))"
56+
done <<< "$(get_suse_initrd_lines)"
5157

5258
# strip whitespace
5359
all_mods="$(echo $all_mods)"

0 commit comments

Comments
 (0)