From 2c54bc996afc22c254f3e0e2f66d377575ad73c5 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Fri, 29 May 2009 23:56:55 -0400 Subject: [PATCH] Victor pointed out --hostonly doesn't go into check. --- modules.d/40nfsroot/check | 2 +- modules.d/90crypt/check | 2 +- modules.d/90dmraid/check | 2 +- modules.d/90kernel-modules-loaded/check | 2 +- modules.d/90lvm/check | 2 +- modules.d/90mdraid/check | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules.d/40nfsroot/check b/modules.d/40nfsroot/check index 1b4b53e..4abc23f 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 8f08cd8..8457f85 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 6dc85b8..67051db 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 178bce5..44be0a0 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 1c54b34..a5ce6a5 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 909b67f..0d0605a 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 -- 2.7.4