[Drbd-dev] [PATCH] drbd-utils: drbd service: specifying commands from /sbin/ with absolute path

Imre Palik imrep.amz at gmail.com
Mon Feb 9 14:05:38 CET 2015


From: "Palik, Imre" <imrep at amazon.de>

This change removes the dependance of the service on wether /sbin is
in the path or not.

Signed-off-by: Imre Palik <imrep at amazon.de>
---
 scripts/drbd |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/drbd b/scripts/drbd
index b6b0a2c..482c69d 100755
--- a/scripts/drbd
+++ b/scripts/drbd
@@ -27,6 +27,8 @@ DRBDSETUP="drbdsetup"
 PROC_DRBD="/proc/drbd"
 MODPROBE="/sbin/modprobe"
 RMMOD="/sbin/rmmod"
+UDEVADM="/sbin/udevadm"
+UDEVSETTLE="/sbin/udevsettle"
 UDEV_TIMEOUT=10
 ADD_MOD_PARAM=""
 
@@ -120,13 +122,13 @@ drbd_pretty_status()
 # But don't wait too long.
 _udev_settle()
 {
-	if udevadm version ; then
+	if $UDEVADM version ; then
 		# ok, we have udevadm, use it.
-		udevadm settle --timeout=5
+		$UDEVADM settle --timeout=5
 	else
 		# if udevsettle is not there,
 		# no matter.
-		udevsettle --timeout=5
+		$UDEVSETTLE --timeout=5
 	fi
 }
 
-- 
1.7.9.5



More information about the drbd-dev mailing list