Browse Source

let some modules to respect $mount_needs

Cc: Harald Hoyer <harald@redhat.com>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
master
Cong Wang 13 years ago committed by Harald Hoyer
parent
commit
7f347723d8
  1. 2
      modules.d/95iscsi/module-setup.sh
  2. 2
      modules.d/95nbd/module-setup.sh
  3. 1
      modules.d/95ssh-client/module-setup.sh

2
modules.d/95iscsi/module-setup.sh

@ -23,7 +23,7 @@ check() { @@ -23,7 +23,7 @@ check() {
[[ -d iscsi_session ]]
)

[[ $hostonly ]] && {
[[ $hostonly ]] || [[ $mount_needs ]] && {
_rootdev=$(find_root_block_device)
if [[ $_rootdev ]]; then
# root lives on a block device, so we can be more precise about

2
modules.d/95nbd/module-setup.sh

@ -9,7 +9,7 @@ check() { @@ -9,7 +9,7 @@ check() {

# if an nbd device is not somewhere in the chain of devices root is
# mounted on, fail the hostonly check.
[[ $hostonly ]] && {
[[ $hostonly ]] || [[ $mount_needs ]] && {
is_nbd() { [[ -b /dev/block/$1 && $1 == 43:* ]] ;}
. $dracutfunctions


1
modules.d/95ssh-client/module-setup.sh

@ -8,6 +8,7 @@ check() { @@ -8,6 +8,7 @@ check() {
# If our prerequisites are not met, fail.
type -P ssh >/dev/null || return 1
type -P scp >/dev/null || return 1
[[ $mount_needs ]] && return 1
if [[ $sshkey ]]; then
[ ! -f $sshkey ] && {
derror "sshkey is not found!"

Loading…
Cancel
Save