move uefi-lib to a seperate module

diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh
index 007aa59a8ecd00dbcdc1804a3ce81c77f3d8a45f..653d88ebbefa9a5932cf499d803c34b983b29a55 100755 (executable)
--- a/modules.d/95fcoe-uefi/module-setup.sh
+++ b/modules.d/95fcoe-uefi/module-setup.sh
@@ -4,14 +4,12 @@
 
 # called by dracut
 check() {
-    [[ $hostonly ]] || [[ $mount_needs ]] && return 1
-
     return 0
 }
 
 # called by dracut
 depends() {
-    echo fcoe bash
+    echo fcoe uefi-lib
     return 0
 }
 

diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
index 2605fa03ba2f201d581a8597b380a93cc91a2db7..539c46458eb26a6049c9757a61cd52bdb3cdde5e 100755 (executable)
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -4,11 +4,6 @@
 
 # called by dracut
 check() {
-    # FIXME
-    # If hostonly was requested, fail the check until we have some way of
-    # knowing we are booting from FCoE
-    [[ $hostonly ]] || [[ $mount_needs ]] && return 1
-
     for i in dcbtool fipvlan lldpad ip readlink; do
         type -P $i >/dev/null || return 1
     done

diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
index e53cf2ec068d3565e376790dba35d843bc24931f..d4dbca974245ef287247bc46b4680504cd2d26c8 100755 (executable)
--- a/modules.d/99base/module-setup.sh
+++ b/modules.d/99base/module-setup.sh
@@ -45,7 +45,6 @@ install() {
     mkdir -p ${initdir}/tmp
 
     inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
-    inst_simple "$moddir/uefi-lib.sh" "/lib/uefi-lib.sh"
 
     if ! dracut_module_included "systemd"; then
         inst_multiple switch_root || dfatal "Failed to install switch_root"

diff --git a/modules.d/99uefi-lib/module-setup.sh b/modules.d/99uefi-lib/module-setup.sh
new file mode 100755 (executable)
index 0000000..4a856ea
--- /dev/null
+++ b/modules.d/99uefi-lib/module-setup.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# module-setup for img-lib
+
+# called by dracut
+check() {
+    return 255
+}
+
+# called by dracut
+depends() {
+    echo bash
+    return 0
+}
+
+# called by dracut
+install() {
+    inst_simple "$moddir/uefi-lib.sh" "/lib/uefi-lib.sh"
+}
+

diff --git a/modules.d/99base/uefi-lib.sh b/modules.d/99uefi-lib/uefi-lib.sh
similarity index 100%
rename from modules.d/99base/uefi-lib.sh
rename to modules.d/99uefi-lib/uefi-lib.sh