Skip to content

Commit 0447f01

Browse files
committed
modprobe.d: use softdep to load sd_mod and sg
Since the Tumbleweed kernel update to 6.5.4, scsi_mod and sd_mod are compiled as loadable modules rather than built-in. This makes it possible to use a softdep rather than modules-load.d to load the required high-level SCSI drivers. Load sd_mod early to stabilize the ordering of /dev/sdX devices (bsc#1216070), and (for now) load sg early, too (bsc#1036463) Signed-off-by: Martin Wilck <[email protected]>
1 parent 9b3340f commit 0447f01

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

modprobe.conf/common/10-scsi.conf

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# load sd_mod and sg early (bsc#1216070, bsc#1036463)
2+
softdep scsi_mod post: sd_mod sg

modules-load.d/sg.conf

-2
This file was deleted.

suse-module-tools.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,10 @@ echo 'Wants=boot-sysctl.service' >>"%{buildroot}%{sysctl_dropin}"
142142
%endif
143143

144144
install -d -m 755 "%{buildroot}%{_modulesloaddir}"
145-
install -pm 644 -t "%{buildroot}%{_modulesloaddir}" modules-load.d/*.conf
145+
for _x in modules-load.d/*.conf; do
146+
[ -e "$_x" ] || continue
147+
install -pm 644 -t "%{buildroot}%{_modulesloaddir}" "$_x"
148+
done
146149

147150
%ifarch ppc64 ppc64le
148151
install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators

0 commit comments

Comments
 (0)