commit 8d01e08897c95bcaa09b64a9ea763d34e9accbb1 Author: Benjamin Marzinski Date: Tue Oct 4 23:13:49 2011 -0500 multipath: make sure all the hwe attributes get merged Not all of the hwe attributes were getting merged. Also, multipathd show config was putting an extra set of quotes around the entries in the devices section. Signed-off-by: Benjamin Marzinski diff --git a/libmultipath/config.c b/libmultipath/config.c index 4236088..51009ac 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -320,6 +320,10 @@ merge_hwe (struct hwentry * dst, struct hwentry * src) merge_num(no_path_retry); merge_num(minio); merge_num(minio_rq); + merge_num(pg_timeout); + merge_num(flush_on_last_del); + merge_num(fast_io_fail); + merge_num(dev_loss); return 0; } diff --git a/libmultipath/print.c b/libmultipath/print.c index 37a4e04..ba4210e 100644 --- a/libmultipath/print.c +++ b/libmultipath/print.c @@ -860,7 +860,7 @@ snprint_hwentry (char * buff, int len, struct hwentry * hwe) if (fwd > len) return len; iterate_sub_keywords(rootkw, kw, i) { - fwd += snprint_keyword(buff + fwd, len - fwd, "\t\t%k \"%v\"\n", + fwd += snprint_keyword(buff + fwd, len - fwd, "\t\t%k %v\n", kw, hwe); if (fwd > len) return len;