From: Warren Togami Date: Sat, 30 May 2009 03:56:55 +0000 (-0400) Subject: Victor pointed out --hostonly doesn't go into check. X-Git-Tag: 0.1~152 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c54bc996afc22c254f3e0e2f66d377575ad73c5;p=thirdparty%2Fdracut.git Victor pointed out --hostonly doesn't go into check. --- diff --git a/modules.d/40nfsroot/check b/modules.d/40nfsroot/check index 1b4b53e1b..4abc23fea 100755 --- a/modules.d/40nfsroot/check +++ b/modules.d/40nfsroot/check @@ -1,5 +1,5 @@ #!/bin/sh [ "$1" = "-d" ] && echo network -[ "$1" = "-H" ] || [ "$1" = "--hostonly" ] && ! egrep -q '/ nfs[34 ]' /proc/mounts && exit 1 +[ "$1" = "-H" ] && ! egrep -q '/ nfs[34 ]' /proc/mounts && exit 1 which rpcbind rpc.statd mount.nfs mount.nfs4 umount >/dev/null 2>&1 || exit 1 exit 0 diff --git a/modules.d/90crypt/check b/modules.d/90crypt/check index 8f08cd88a..8457f8536 100755 --- a/modules.d/90crypt/check +++ b/modules.d/90crypt/check @@ -2,7 +2,7 @@ which cryptsetup >/dev/null 2>&1 || exit 1 -if [ "$1" = "-H" ] || [ "$1" = "--hostonly" ]; then +if [ "$1" = "-H" ]; then blkid | grep -q crypt_LUKS || exit 1 fi diff --git a/modules.d/90dmraid/check b/modules.d/90dmraid/check index 6dc85b802..67051db88 100755 --- a/modules.d/90dmraid/check +++ b/modules.d/90dmraid/check @@ -1,7 +1,7 @@ #!/bin/sh which dmraid >/dev/null 2>&1 || exit 1 -if [ "$1" = "-H" ] || [ "$1" = "--hostonly" ]; then +if [ "$1" = "-H" ]; then dmraid -r | grep -q ok || exit 1 fi diff --git a/modules.d/90kernel-modules-loaded/check b/modules.d/90kernel-modules-loaded/check index 178bce53c..44be0a010 100755 --- a/modules.d/90kernel-modules-loaded/check +++ b/modules.d/90kernel-modules-loaded/check @@ -1,3 +1,3 @@ #!/bin/sh -[ "$1" = "-H" ] || [ "$1" = "--hostonly" ] && exit 1 +[ "$1" = "-H" ] && exit 1 diff --git a/modules.d/90lvm/check b/modules.d/90lvm/check index 1c54b34f3..a5ce6a572 100755 --- a/modules.d/90lvm/check +++ b/modules.d/90lvm/check @@ -1,7 +1,7 @@ #!/bin/sh which lvm >/dev/null 2>&1 || exit 1 -if [ "$1" = "-H" ] || [ "$1" = "--hostonly" ]; then +if [ "$1" = "-H" ]; then blkid | grep -q lvm2pv || exit 1 fi diff --git a/modules.d/90mdraid/check b/modules.d/90mdraid/check index 909b67f55..0d0605a24 100755 --- a/modules.d/90mdraid/check +++ b/modules.d/90mdraid/check @@ -1,7 +1,7 @@ #!/bin/sh which mdadm >/dev/null 2>&1 || exit 1 -if [ "$1" = "-H" ] || [ "$1" = "--hostonly" ]; then +if [ "$1" = "-H" ]; then blkid | grep -q linux_raid || exit 1 fi