<div dir="ltr">Merged.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Oct 18, 2016 at 7:03 PM, Benjamin Marzinski <span dir="ltr"><<a href="mailto:bmarzins@redhat.com" target="_blank">bmarzins@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Tue, Oct 18, 2016 at 03:22:45PM +0200, Xose Vazquez Perez wrote:<br>
<br>
ACK<br>
<br>
-Ben<br>
<div class="HOEnZb"><div class="h5"><br>
> Cc: Benjamin Marzinski <<a href="mailto:bmarzins@redhat.com">bmarzins@redhat.com</a>><br>
> Cc: Hannes Reinecke <<a href="mailto:hare@suse.de">hare@suse.de</a>><br>
> 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/defaults.h | 1 +<br>
> libmultipath/propsel.c | 2 +-<br>
> 2 files changed, 2 insertions(+), 1 deletion(-)<br>
><br>
> diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h<br>
> index d00a86f..e9581a6 100644<br>
> --- a/libmultipath/defaults.h<br>
> +++ b/libmultipath/defaults.h<br>
> @@ -32,6 +32,7 @@<br>
> #define DEFAULT_PRIO_ARGS ""<br>
> #define DEFAULT_CHECKER TUR<br>
> #define DEFAULT_FLUSH FLUSH_DISABLED<br>
> +#define DEFAULT_USER_FRIENDLY_NAMES USER_FRIENDLY_NAMES_OFF<br>
><br>
> #define DEFAULT_CHECKINT 5<br>
> #define MAX_CHECKINT(a) (a << 2)<br>
> diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c<br>
> index 88a1916..aaf99fb 100644<br>
> --- a/libmultipath/propsel.c<br>
> +++ b/libmultipath/propsel.c<br>
> @@ -228,7 +228,7 @@ want_user_friendly_names(<wbr>struct config *conf, struct multipath * mp)<br>
> "(controller setting)");<br>
> do_set(user_friendly_names, conf, user_friendly_names,<br>
> "(config file setting)");<br>
> - do_default(user_friendly_<wbr>names, USER_FRIENDLY_NAMES_OFF);<br>
> + do_default(user_friendly_<wbr>names, DEFAULT_USER_FRIENDLY_NAMES);<br>
> out:<br>
> condlog(3, "%s: user_friendly_names = %s %s", mp->wwid,<br>
> (user_friendly_names == USER_FRIENDLY_NAMES_ON)? "yes" : "no",<br>
> --<br>
> 2.10.1<br>
</div></div></blockquote></div><br></div>