<div dir="ltr">Merged,<div>thanks.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Apr 8, 2017 at 3:30 PM, Xose Vazquez Perez <span dir="ltr"><<a href="mailto:xose.vazquez@gmail.com" target="_blank">xose.vazquez@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Cc: Christophe Varoqui <<a href="mailto:christophe.varoqui@opensvc.com">christophe.varoqui@opensvc.<wbr>com</a>><br>
Cc: device-mapper development <<a href="mailto:dm-devel@redhat.com">dm-devel@redhat.com</a>><br>
Signed-off-by: Xose Vazquez Perez <<a href="mailto:xose.vazquez@gmail.com">xose.vazquez@gmail.com</a>><br>
---<br>
libmultipath/propsel.c | 12 ++++++------<br>
1 file changed, 6 insertions(+), 6 deletions(-)<br>
<br>
diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c<br>
index dd10ceb..5f70d86 100644<br>
--- a/libmultipath/propsel.c<br>
+++ b/libmultipath/propsel.c<br>
@@ -162,7 +162,7 @@ int select_pgpolicy(struct config *conf, struct multipath * mp)<br>
<br>
if (conf->pgpolicy_flag > 0) {<br>
mp->pgpolicy = conf->pgpolicy_flag;<br>
- origin = "(cmd line flag)";<br>
+ origin = "(setting: multipath command line [-p] flag)";<br>
goto out;<br>
}<br>
mp_set_mpe(pgpolicy);<br>
@@ -251,18 +251,18 @@ int select_alias(struct config *conf, struct multipath * mp)<br>
mp->alias_old, mp->alias_prefix,<br>
conf->bindings_read_only);<br>
memset (mp->alias_old, 0, WWID_SIZE);<br>
- origin = "(using existing alias)";<br>
+ origin = "(setting: using existing alias)";<br>
}<br>
<br>
if (mp->alias == NULL) {<br>
mp->alias = get_user_friendly_alias(mp-><wbr>wwid,<br>
conf->bindings_file, mp->alias_prefix, conf->bindings_read_only);<br>
- origin = "(user_friendly_name)";<br>
+ origin = "(setting: user_friendly_name)";<br>
}<br>
out:<br>
if (mp->alias == NULL) {<br>
mp->alias = STRDUP(mp->wwid);<br>
- origin = "(default to wwid)";<br>
+ origin = "(setting: default to WWID)";<br>
}<br>
if (mp->alias)<br>
condlog(3, "%s: alias = %s %s", mp->wwid, mp->alias, origin);<br>
@@ -565,7 +565,7 @@ int select_retain_hwhandler(struct config *conf, struct multipath *mp)<br>
<br>
if (!VERSION_GE(conf->version, minv_dm_retain)) {<br>
mp->retain_hwhandler = RETAIN_HWHANDLER_OFF;<br>
- origin = "(requires kernel version >= 1.5.0)";<br>
+ origin = "(setting: WARNING, requires kernel version >= 1.5.0)";<br>
goto out;<br>
}<br>
mp_set_ovr(retain_hwhandler);<br>
@@ -614,7 +614,7 @@ int select_deferred_remove(struct config *conf, struct multipath *mp)<br>
<br>
#ifndef LIBDM_API_DEFERRED<br>
mp->deferred_remove = DEFERRED_REMOVE_OFF;<br>
- origin = "(not compiled with support)";<br>
+ origin = "(setting: WARNING, not compiled with support)";<br>
goto out;<br>
#endif<br>
if (mp->deferred_remove == DEFERRED_REMOVE_IN_PROGRESS) {<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.12.2<br>
<br>
</font></span></blockquote></div><br></div>