Thomas Renninger
46c37d057a
- Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1
Tue May 20 13:23
Modified dracut_v37_to_HEAD.patch
Modified mdraid-setup.patch
Modified dracut-install-persistent-rule.patch
- Add /etc/dracut.d.conf/01-dist modifications to file instead of writing
to it via rpm build section
Add 0033-dracut_hostonly_hostonly_cmdline_default.patch
Add 0034-suse.conf.example_extend.patch
- Cleanup mkinitrd-suse.sh:
* Remove hostonly and hostonly-cmdline -> this is done via 01-dist config
file now
- Always add network module based on modules_setup.sh check() function and not
via 01-dist config file
Add 0035-always_add_network.patch
- Add find to debug binaries - Useful and harmless
Add 0036-add_extra_debug_binaries.patch
- Fix adding of network modules for s390 (bnc#879302)
Add 0037-fix_s390_network_modules_install.patch
- Omit resume module on s390(x) - There is no suspend on s390
Add 0039-s390_no_resume_module.patch
- Do not wait for swap - This causes trouble with Rudi's autobuild images:
Add 0038-remove_waiting_for_swap_dev.patch
- Fcoe and ibft fixes (bnc#879038):
Add 0041-only_enable_network_if_explicitly_requested.patch
Add 0042-ibft_autoconfig_param.patch
Add 0043-fcoe_strip_quotes.patch
- Print message when starting to update bootloader
Add 0044-Add_update_bootloader_msg.patch
- ToDo: Pass hostonly variable earlier so that is always avail in check()
OBS-URL: https://build.opensuse.org/request/show/235703
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
27 lines
905 B
Diff
27 lines
905 B
Diff
dracut: Only add fcoe module in hostonly mode if there are active fcoe devices
|
|
|
|
This also avoids unnecessary warnings from require_binary checks.
|
|
In hostonly mode fcoe is not needed at all if there are no active fcoe
|
|
devices. So silently omit this module in this case.
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
|
|
Index: dracut-037/modules.d/95fcoe/module-setup.sh
|
|
===================================================================
|
|
--- dracut-037.orig/modules.d/95fcoe/module-setup.sh
|
|
+++ dracut-037/modules.d/95fcoe/module-setup.sh
|
|
@@ -43,6 +43,13 @@ cmdline() {
|
|
|
|
# called by dracut
|
|
check() {
|
|
+ # Only add in hostonly mode if fcoe devices exist
|
|
+ if [[ $hostonly ]]; then
|
|
+ ls /sys/bus/fcoe/devices/ctlr_* >/dev/null 2>&1
|
|
+ if [ $? -ne 0 ];then
|
|
+ return 255
|
|
+ fi
|
|
+ fi
|
|
require_binaries dcbtool fipvlan lldpad ip readlink || return 1
|
|
return 0
|
|
}
|