lvmlockctl: rename from lvmlock

2 files changed, 5 insertions, 8 deletions

diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in
index 16b8dac96..6d34cb6f0 100644
--- a/daemons/lvmlockd/Makefile.in
+++ b/daemons/lvmlockd/Makefile.in
@@ -20,7 +20,7 @@ SOURCES = \
 	lvmlockd-sanlock.c \
 	lvmlockd-dlm.c
 
-TARGETS = lvmlockd lvmlock
+TARGETS = lvmlockd lvmlockctl
 
 .PHONY: install_lvmlockd
 
@@ -39,9 +39,9 @@ lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
 	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
 
-lvmlock: lvmlock.o $(top_builddir)/libdaemon/client/libdaemonclient.a \
+lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a \
 		    $(top_builddir)/libdaemon/server/libdaemonserver.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlock.o \
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o \
 	$(DL_LIBS) $(LVMLIBS) -rdynamic
 
 install_lvmlockd: lvmlockd
diff --git a/daemons/lvmlockd/lvmlock.c b/daemons/lvmlockd/lvmlockctl.c
index 1fcbb7bc4..d42ebb21e 100644
--- a/daemons/lvmlockd/lvmlock.c
+++ b/daemons/lvmlockd/lvmlockctl.c
@@ -489,7 +489,7 @@ static int do_stop_lockspaces(void)
 
 static void print_usage(void)
 {
-	printf("lvmlock options\n");
+	printf("lvmlockctl options\n");
 	printf("Options:\n");
 	printf("--help | -h\n");
 	printf("      Show this help information.\n");
@@ -526,19 +526,16 @@ static int read_options(int argc, char *argv[])
 		{"gl-enable",       required_argument, 0,  'E' },
 		{"gl-disable",      required_argument, 0,  'D' },
 		{"stop-lockspaces", no_argument,       0,  'S' },
-		{"sleep",           required_argument, 0,  's' },
 		{0, 0, 0, 0 }
 	};
 
-	/*
 	if (argc == 1) {
 		print_usage();
 		exit(0);
 	}
-	*/
 
 	while (1) {
-		c = getopt_long(argc, argv, "hqidE:D:s:w:f:S", long_options, &option_index);
+		c = getopt_long(argc, argv, "hqidE:D:w:S", long_options, &option_index);
 		if (c == -1)
 			break;