Skip to content

Commit f65e559

Browse files
authored
Merge pull request dracutdevs#81 from lnussel/usrmerge
fix(suse-initrd): find links of usrmerged kernels (boo#1184804)
2 parents 215eab8 + ddc9944 commit f65e559

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

suse/mkinitrd-suse.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,12 @@ default_kernel_images() {
193193
# script is itself called from within the binary kernel
194194
# packages, and rpm does not allow recursive calls.
195195

196-
[ -L "$boot_dir/$kernel_image" ] && continue
196+
if [ -L "$boot_dir/$kernel_image" ]; then
197+
# check for usrmerged kernel. in That case the link point to
198+
# /usr/lib/modules
199+
link=$(readlink "$boot_dir/$kernel_image")
200+
[ "${link#/usr/lib/modules}" = "$link" ] && continue
201+
fi
197202
[ "${kernel_image%%.gz}" != "$kernel_image" ] && continue
198203

199204
kernel_version=$(kernel_version_from_image \

0 commit comments

Comments
 (0)