45edee9f69
- 90btrfs: Install rescue utilities to initrd * Add: 0100-btrfs-add-initrd-rescue-utilities.patch - 40network: create /var/lib/wicked in ifup.sh (bnc#885141) * Add: 0089-40network-create-var-lib-wicked-in-ifup.sh.patch - dracut: caps: Remove whole caps module * Add: 0090-dracut-caps-Remove-whole-caps-module.patch - dracut: biosdevname: Only install if present * Add: 0091-dracut-biosdevname-In-SUSE-biosdevname-package-is-in.patch - dracut: nbd: Only complain of missing binary in hostonly mode if rootfs is on nbd * Add: 0092-dracut-nbd-Only-complain-of-missing-binary-in-hoston.patch - 95iscsi: generate commandline for software iscsi (bnc#880108) * Add: 0093-95iscsi-generate-commandline-for-software-iscsi.patch - Implement shortcut 'ip=<ifname>:static' for static configuration * Add: 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch - 95iscsi: use static configuration for software iscsi (bnc#884768) * Add: 0095-95iscsi-use-static-configuration-for-software-iscsi.patch - dracut: Fix error: local: can only be used in a function * Add: 0096-dracut-Fix-error-local-can-only-be-used-in-a-functio.patch - Implement 'rd.timeout' to modify the device timeout (bnc#878770) * Add: 0097-Implement-rd.timeout-to-modify-the-device-timeout.patch - Do not call 'lvm' for non-LVM device-mapper devices * Add: 0098-Do-not-call-lvm-for-non-LVM-device-mapper-devices.patch - 90multipath: Load device_handler modules early during boot (bnc#871617) * Add: 0099-90multipath-Load-device_handler-modules-early-during.patch OBS-URL: https://build.opensuse.org/request/show/239538 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=168
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From e4e24c1e841f91987561c1970148872214bbaaf8 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Renninger <trenn@suse.de>
|
|
Date: Tue, 1 Jul 2014 13:54:04 +0200
|
|
Subject: dracut: nbd: Only complain of missing binary in hostonly mode if
|
|
rootfs is on nbd
|
|
|
|
In not hostonly mode, require_binaries will still complain.
|
|
If in hostonly mode and the module is explicitly added via -a nbd, then
|
|
install() section will still complain later:
|
|
dracut-install: ERROR: installing 'nbd-client'
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
modules.d/95nbd/module-setup.sh | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh
|
|
index e62f290..dc5102e 100755
|
|
--- a/modules.d/95nbd/module-setup.sh
|
|
+++ b/modules.d/95nbd/module-setup.sh
|
|
@@ -5,8 +5,6 @@
|
|
# called by dracut
|
|
check() {
|
|
local _rootdev
|
|
- # If our prerequisites are not met, fail.
|
|
- require_binaries nbd-client || return 1
|
|
|
|
# if an nbd device is not somewhere in the chain of devices root is
|
|
# mounted on, fail the hostonly check.
|
|
@@ -17,6 +15,7 @@ check() {
|
|
[[ -b /dev/block/$_rootdev ]] || return 1
|
|
check_block_and_slaves is_nbd "$_rootdev" || return 255
|
|
}
|
|
+ require_binaries nbd-client || return 1
|
|
|
|
return 0
|
|
}
|
|
--
|
|
1.8.4.5
|
|
|