File 0103-md-cluster-use-64s-to-print-cluster_name.patch of Package mdadm.5365
From 2cf42394f020af6643451afb6ca41c3f831c14ef Mon Sep 17 00:00:00 2001
From: Guoqing Jiang <gqjiang@suse.com>
Date: Mon, 6 Jul 2015 16:52:11 +0800
Subject: [PATCH 151/359] md-cluster: use %-64s to print cluster_name
References: bsc#1081910
Left align is better for cluster with name less than 64. Also
make the output of cluster name is aligned with others.
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Coly Li <colyli@suse.de>
---
bitmap.c | 2 +-
super1.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bitmap.c b/bitmap.c
index 60865bc..7beb80b 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -342,7 +342,7 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
100.0 * info->dirty_bits / (info->total_bits?:1));
} else {
printf(" Cluster nodes : %d\n", sb->nodes);
- printf(" Cluster name : %64s\n", sb->cluster_name);
+ printf(" Cluster name : %-64s\n", sb->cluster_name);
for (i = 0; i < (int)sb->nodes; i++) {
if (i) {
free(info);
diff --git a/super1.c b/super1.c
index fda71e3..9b991e6 100644
--- a/super1.c
+++ b/super1.c
@@ -305,7 +305,7 @@ static void examine_super1(struct supertype *st, char *homehost)
printf(" (local to host %s)", homehost);
printf("\n");
if (bms->nodes > 0)
- printf("Cluster Name : %s", bms->cluster_name);
+ printf(" Cluster Name : %-64s\n", bms->cluster_name);
atime = __le64_to_cpu(sb->ctime) & 0xFFFFFFFFFFULL;
printf(" Creation Time : %.24s\n", ctime(&atime));
c=map_num(pers, __le32_to_cpu(sb->level));
@@ -763,7 +763,7 @@ static void detail_super1(struct supertype *st, char *homehost)
strncmp(sb->set_name, homehost, l) == 0)
printf(" (local to host %s)", homehost);
if (bms->nodes > 0)
- printf("Cluster Name : %64s", bms->cluster_name);
+ printf("\n Cluster Name : %-64s", bms->cluster_name);
printf("\n UUID : ");
for (i=0; i<16; i++) {
if ((i&3)==0 && i != 0) printf(":");
--
2.16.1
