054341caad
Update to dracut-044 and several cleanups. Works on tumbleweed standard installation and NFS root. OBS-URL: https://build.opensuse.org/request/show/346361 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=244
29 lines
950 B
Diff
29 lines
950 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-init.sh | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
Index: dracut-044/dracut-init.sh
|
|
===================================================================
|
|
--- dracut-044.orig/dracut-init.sh
|
|
+++ dracut-044/dracut-init.sh
|
|
@@ -1122,6 +1122,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 ]] \
|