cluster: STABLE3 - qdisk: mkqdisk argument positioning
Lon Hohberger
lon at fedoraproject.org
Fri Feb 12 19:47:44 UTC 2010
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1e0a66900d7444444c73ebcc1fdabe42ff5e138e
Commit: 1e0a66900d7444444c73ebcc1fdabe42ff5e138e
Parent: bc271e80a8221d264d269a74ccf6e46c4b6cce4d
Author: Tatsuo Kawasaki <kawasaki at redhat.com>
AuthorDate: Fri Feb 12 14:42:52 2010 -0500
Committer: Lon Hohberger <lhh at redhat.com>
CommitterDate: Fri Feb 12 14:42:52 2010 -0500
qdisk: mkqdisk argument positioning
mkqdisk debug option (-d) doesn't work after -L option.
This works:
mkqdisk -d -L
This should also work:
mkqdisk -L -d
This patch fixes the behavior.
Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
cman/qdisk/mkqdisk.c | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/cman/qdisk/mkqdisk.c b/cman/qdisk/mkqdisk.c
index 338bd5c..6d64ee5 100644
--- a/cman/qdisk/mkqdisk.c
+++ b/cman/qdisk/mkqdisk.c
@@ -19,7 +19,7 @@ main(int argc, char **argv)
{
char device[128];
char *newdev = NULL, *newlabel = NULL;
- int rv, verbose_level = 1;
+ int rv, flg = 0, verbose_level = 1;
printf(PROGRAM_NAME " v" RELEASE_VERSION "\n\n");
@@ -49,10 +49,12 @@ main(int argc, char **argv)
break;
case 'L':
/* List */
- return find_partitions(NULL, NULL, 0, verbose_level);
+ flg = rv;
+ break;
case 'f':
- return find_partitions( optarg, device,
- sizeof(device), verbose_level);
+ flg = rv;
+ newlabel = optarg;
+ break;
case 'c':
newdev = optarg;
break;
@@ -68,6 +70,14 @@ main(int argc, char **argv)
}
}
+ /* list */
+ if (flg == 'L') {
+ return find_partitions(NULL, NULL, 0, verbose_level);
+ } else if (flg == 'f') {
+ return find_partitions( newlabel, device,
+ sizeof(device), verbose_level);
+ }
+
if (!newdev && !newlabel) {
printf("usage: mkqdisk -L | -f <label> | -c "
"<device> -l <label>\n");
More information about the cluster-commits
mailing list