[Cluster-devel] [PATCH 5/5] rgmanager: Match fenced's option to disable DBus

[Lon Hohberger]

Clean cherry-pick in to RHEL6 branch

Resolves: rhbz#657756

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/man/rgmanager.8    |    2 +-
 rgmanager/src/daemons/main.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rgmanager/man/rgmanager.8 b/rgmanager/man/rgmanager.8
index a4e2c73..2b018d2 100644
--- a/rgmanager/man/rgmanager.8
+++ b/rgmanager/man/rgmanager.8
@@ -371,7 +371,7 @@ will leave the virtual machine running.
 Run in the foreground (do not fork).
 .IP \-d
 Enable debug-level logging.
-.IP \-D
+.IP \-q
 Disable DBus signals which are normally sent when services change state.
 .IP \-w
 Disable internal process monitoring (for debugging).
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index dad379a..02cd2dc 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -951,7 +951,7 @@ main(int argc, char **argv)
 	pthread_t th;
 	cman_handle_t clu = NULL;
 
-	while ((rv = getopt(argc, argv, "wfdND")) != EOF) {
+	while ((rv = getopt(argc, argv, "wfdNq")) != EOF) {
 		switch (rv) {
 		case 'w':
 			wd = 0;
@@ -965,7 +965,7 @@ main(int argc, char **argv)
 		case 'f':
 			foreground = 1;
 			break;
-		case 'D':
+		case 'q':
 			rgm_dbus_notify = 0;
 			break;
 		default:
-- 
1.7.2.3