32 lines
937 B
Diff
32 lines
937 B
Diff
|
From a7996e5e33c0456c96764dfb1ab35c0a59134ccc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabian Vogt <fvogt@suse.com>
|
||
|
|
Date: Tue, 3 Nov 2015 16:29:21 +0100
|
||
|
|
Subject: [PATCH] Don't let inst1mod fail if module is built-in
|
||
|
|
|
||
|
|
- Fixes bsc#935563
|
||
|
|
|
||
|
|
Signed-off-by: Fabian Vogt <fvogt@suse.com>
|
||
|
|
---
|
||
|
|
dracut-functions.sh | 5 +++++
|
||
|
|
1 file changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||
|
|
index b666446..e5be295 100755
|
||
|
|
--- a/dracut-functions.sh
|
||
|
|
+++ b/dracut-functions.sh
|
||
|
|
@@ -1721,6 +1721,11 @@ instmods() {
|
||
|
|
return 0
|
||
|
|
fi
|
||
|
|
|
||
|
|
+ if grep -q "/${_mod}.ko" /lib/modules/$kernel/modules.builtin; then
|
||
|
|
+ # Module is built-in
|
||
|
|
+ return 0
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
# If we are building a host-specific initramfs and this
|
||
|
|
# module is not already loaded, move on to the next one.
|
||
|
|
[[ $hostonly ]] \
|
||
|
|
--
|
||
|
|
2.6.2
|
||
|
|
|