|
 |
18971c |
From c26eb3eb3ace56e336817d007da039c058cf330f Mon Sep 17 00:00:00 2001
|
|
|
18971c |
From: Harald Hoyer <harald@redhat.com>
|
|
|
18971c |
Date: Thu, 12 Dec 2013 09:49:06 +0100
|
|
|
18971c |
Subject: [PATCH] move uefi-lib to a seperate module
|
|
|
18971c |
|
|
|
18971c |
---
|
|
|
18971c |
modules.d/95fcoe-uefi/module-setup.sh | 4 +---
|
|
|
18971c |
modules.d/95fcoe/module-setup.sh | 5 -----
|
|
|
18971c |
modules.d/99base/module-setup.sh | 1 -
|
|
|
18971c |
modules.d/99uefi-lib/module-setup.sh | 19 +++++++++++++++++++
|
|
|
18971c |
modules.d/{99base => 99uefi-lib}/uefi-lib.sh | 0
|
|
|
18971c |
5 files changed, 20 insertions(+), 9 deletions(-)
|
|
|
18971c |
create mode 100755 modules.d/99uefi-lib/module-setup.sh
|
|
|
18971c |
rename modules.d/{99base => 99uefi-lib}/uefi-lib.sh (100%)
|
|
|
18971c |
|
|
|
18971c |
diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh
|
|
|
18971c |
index 007aa59a..653d88eb 100755
|
|
|
18971c |
--- a/modules.d/95fcoe-uefi/module-setup.sh
|
|
|
18971c |
+++ b/modules.d/95fcoe-uefi/module-setup.sh
|
|
|
18971c |
@@ -4,14 +4,12 @@
|
|
|
18971c |
|
|
|
18971c |
# called by dracut
|
|
|
18971c |
check() {
|
|
|
18971c |
- [[ $hostonly ]] || [[ $mount_needs ]] && return 1
|
|
|
18971c |
-
|
|
|
18971c |
return 0
|
|
|
18971c |
}
|
|
|
18971c |
|
|
|
18971c |
# called by dracut
|
|
|
18971c |
depends() {
|
|
|
18971c |
- echo fcoe bash
|
|
|
18971c |
+ echo fcoe uefi-lib
|
|
|
18971c |
return 0
|
|
|
18971c |
}
|
|
|
18971c |
|
|
|
18971c |
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
|
|
|
18971c |
index d3c58cc6..fe8e40aa 100755
|
|
|
18971c |
--- a/modules.d/95fcoe/module-setup.sh
|
|
|
18971c |
+++ b/modules.d/95fcoe/module-setup.sh
|
|
|
18971c |
@@ -3,11 +3,6 @@
|
|
|
18971c |
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
|
18971c |
|
|
|
18971c |
check() {
|
|
|
18971c |
- # FIXME
|
|
|
18971c |
- # If hostonly was requested, fail the check until we have some way of
|
|
|
18971c |
- # knowing we are booting from FCoE
|
|
|
18971c |
- [[ $hostonly ]] || [[ $mount_needs ]] && return 1
|
|
|
18971c |
-
|
|
|
18971c |
for i in dcbtool fipvlan lldpad ip readlink; do
|
|
|
18971c |
type -P $i >/dev/null || return 1
|
|
|
18971c |
done
|
|
|
18971c |
diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
|
|
|
18971c |
index d33a0fb4..52ce4004 100755
|
|
|
18971c |
--- a/modules.d/99base/module-setup.sh
|
|
|
18971c |
+++ b/modules.d/99base/module-setup.sh
|
|
|
18971c |
@@ -42,7 +42,6 @@ install() {
|
|
|
18971c |
mkdir -p ${initdir}/tmp
|
|
|
18971c |
|
|
|
18971c |
inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
|
|
|
18971c |
- inst_simple "$moddir/uefi-lib.sh" "/lib/uefi-lib.sh"
|
|
|
18971c |
|
|
|
18971c |
if ! dracut_module_included "systemd"; then
|
|
|
18971c |
inst_multiple switch_root || dfatal "Failed to install switch_root"
|
|
|
18971c |
diff --git a/modules.d/99uefi-lib/module-setup.sh b/modules.d/99uefi-lib/module-setup.sh
|
|
|
18971c |
new file mode 100755
|
|
|
18971c |
index 00000000..4a856eaa
|
|
|
18971c |
--- /dev/null
|
|
|
18971c |
+++ b/modules.d/99uefi-lib/module-setup.sh
|
|
|
18971c |
@@ -0,0 +1,19 @@
|
|
|
18971c |
+#!/bin/bash
|
|
|
18971c |
+# module-setup for img-lib
|
|
|
18971c |
+
|
|
|
18971c |
+# called by dracut
|
|
|
18971c |
+check() {
|
|
|
18971c |
+ return 255
|
|
|
18971c |
+}
|
|
|
18971c |
+
|
|
|
18971c |
+# called by dracut
|
|
|
18971c |
+depends() {
|
|
|
18971c |
+ echo bash
|
|
|
18971c |
+ return 0
|
|
|
18971c |
+}
|
|
|
18971c |
+
|
|
|
18971c |
+# called by dracut
|
|
|
18971c |
+install() {
|
|
|
18971c |
+ inst_simple "$moddir/uefi-lib.sh" "/lib/uefi-lib.sh"
|
|
|
18971c |
+}
|
|
|
18971c |
+
|
|
|
18971c |
diff --git a/modules.d/99base/uefi-lib.sh b/modules.d/99uefi-lib/uefi-lib.sh
|
|
|
18971c |
similarity index 100%
|
|
|
18971c |
rename from modules.d/99base/uefi-lib.sh
|
|
|
18971c |
rename to modules.d/99uefi-lib/uefi-lib.sh
|