From c80b5de7ead9cee4fc202ff1be1d686cf5cb4fff Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Jan 24 2022 17:47:36 +0000
Subject: kernel-binary.spec.in: Move 20-kernel-default-extra.conf to the correctr

directory (bsc#1195051).

---

diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index 6794c74..6afee9a 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -1032,8 +1032,16 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
     # kernel versions, otherwise file conflicts might arise with
     # multiversion(kernel).
 
-    mkdir -p %buildroot/etc/modprobe.d
-    cat >%buildroot/etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf <<EOF
+    modprobe_d_dir=/etc/modprobe.d
+    %if 0%{?sle_version} > 150300
+    modprobe_d_dir=/lib/modprobe.d
+    %endif
+    %if 0%{?usrmerged}
+    modprobe_d_dir=/usr/lib/modprobe.d
+    %endif
+
+    mkdir -p %buildroot$modprobe_d_dir
+    cat >%buildroot$modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf <<EOF
 # This file overrides the default from 10-unsupported-modules.conf.
 # This is necessary to load kernel modules from the
 # kernel-%{build_flavor}-extra package.
@@ -1042,8 +1050,8 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
 # Please read the comments in 10-unsupported-modules.conf.
 allow_unsupported_modules 1
 EOF
-    echo "%%dir /etc/modprobe.d" >> %my_builddir/kernel-extra.files
-    echo '%%config(noreplace) /etc/modprobe.d/20-kernel-%{build_flavor}-extra.conf' >> %my_builddir/kernel-extra.files
+    echo "%%dir $modprobe_d_dir" >> %my_builddir/kernel-extra.files
+    echo "%%config(noreplace) $modprobe_d_dir/20-kernel-%{build_flavor}-extra.conf" >> %my_builddir/kernel-extra.files
 %endif
 %endif
 for f in %my_builddir/*-kmp-modules; do