From: Dan Williams <dan.j.williams@intel.com>
Date: Tue, 20 Jan 2009 08:36:50 +0000 (-0700)
Subject: mdmon: make switchroot an undecorated option
X-Git-Tag: mdadm-3.0-devel3~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5746141e3f48246cd51f74562e3f947e8d0ddf6a;p=thirdparty%2Fmdadm.git

mdmon: make switchroot an undecorated option

Simplify the usage from:
	mdmon [--switch-root dir] /device/name/for/container
to...
	mdmon /device/name/for/container [target_dir]

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/mdmon.c b/mdmon.c
index 7c5fae5f..acb36a2d 100644
--- a/mdmon.c
+++ b/mdmon.c
@@ -271,7 +271,7 @@ static int do_fork(void)
 
 void usage(void)
 {
-	fprintf(stderr, "Usage: mdmon [--switch-root dir] /device/name/for/container\n");
+	fprintf(stderr, "Usage: mdmon /device/name/for/container [target_dir]\n");
 	exit(2);
 }
 
@@ -287,17 +287,11 @@ int main(int argc, char *argv[])
 	int status = 0;
 
 	switch (argc) {
+	case 3:
+		switchroot = argv[2];
 	case 2:
 		container_name = argv[1];
 		break;
-	case 4:
-		if (strcmp(argv[1], "--switch-root") != 0) {
-			fprintf(stderr, "mdmon: unknown argument %s\n", argv[1]);
-			usage();
-		}
-		switchroot = argv[2];
-		container_name = argv[3];
-		break;
 	default:
 		usage();
 	}
@@ -355,6 +349,8 @@ int mdmon(char *devname, int devnum, int scan, char *switchroot)
 	int status;
 	int ignore;
 
+	dprintf("starting mdmon for %s in %s\n",
+		devname, switchroot ? : "/");
 	mdfd = open_dev(devnum);
 	if (mdfd < 0) {
 		fprintf(stderr, "mdmon: %s: %s\n", devname,