From: Fajar A. Nugraha <github@fajar.net>
Date: Thu, 7 Jul 2011 07:22:19 +0000 (+0700)
Subject: Check for "udevadm settle" vs "udevsettle"
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=3af2ce4d6883ab96814fb1d0bc01368bb06c5343;p=zfs.git

Check for "udevadm settle" vs "udevsettle"

RHEL5 does not have udevadm, so fix initscript accordingly

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #315
---

diff --git a/etc/init.d/zfs.redhat b/etc/init.d/zfs.redhat
index c1f2fb8..d3475f0 100644
--- a/etc/init.d/zfs.redhat
+++ b/etc/init.d/zfs.redhat
@@ -77,7 +77,11 @@ start()
         fi
 
 	# Delay until all required block devices are present.
-	udevadm settle
+	if [ -x /sbin/udevadm ]; then
+		/sbin/udevadm settle
+	elif [ -x /sbin/udevsettle ]; then
+		/sbin/udevsettle
+	fi
 
 	# load kernel module infrastructure
 	if ! grep -q zfs /proc/modules ; then