--- mounting-glusterfs.conf.orig	2015-06-15 16:23:28.000000000 -0300
+++ mounting-glusterfs.conf	2015-06-15 15:26:09.000000000 -0300
@@ -1,9 +1,13 @@
 author "Louis Zuckerman <me@louiszuckerman.com>"
-description "Block the mounting event for glusterfs filesystems until the network interfaces are running"
+description "Block the mounting event for glusterfs filesystems until the glusterfs-server is running"
 
 instance $MOUNTPOINT
 
 start on mounting TYPE=glusterfs
 task
-exec start wait-for-state WAIT_FOR=static-network-up WAITER=mounting-glusterfs-$MOUNTPOINT
-
+script
+  if status glusterfs-server; then
+    start wait-for-state WAIT_FOR=glusterfs-server WAIT_STATE=running \
+        WAITER=mounting-glusterfs-$MOUNTPOINT
+  fi
+end script