Merged. On Tue, Oct 18, 2016 at 7:03 PM, Benjamin Marzinski <[email protected]> wrote:
> On Tue, Oct 18, 2016 at 03:22:45PM +0200, Xose Vazquez Perez wrote: > > ACK > > -Ben > > > Cc: Benjamin Marzinski <[email protected]> > > Cc: Hannes Reinecke <[email protected]> > > Cc: Christophe Varoqui <[email protected]> > > Cc: device-mapper development <[email protected]> > > Signed-off-by: Xose Vazquez Perez <[email protected]> > > --- > > libmultipath/defaults.h | 1 + > > libmultipath/propsel.c | 2 +- > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h > > index d00a86f..e9581a6 100644 > > --- a/libmultipath/defaults.h > > +++ b/libmultipath/defaults.h > > @@ -32,6 +32,7 @@ > > #define DEFAULT_PRIO_ARGS "" > > #define DEFAULT_CHECKER TUR > > #define DEFAULT_FLUSH FLUSH_DISABLED > > +#define DEFAULT_USER_FRIENDLY_NAMES USER_FRIENDLY_NAMES_OFF > > > > #define DEFAULT_CHECKINT 5 > > #define MAX_CHECKINT(a) (a << 2) > > diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c > > index 88a1916..aaf99fb 100644 > > --- a/libmultipath/propsel.c > > +++ b/libmultipath/propsel.c > > @@ -228,7 +228,7 @@ want_user_friendly_names(struct config *conf, > struct multipath * mp) > > "(controller setting)"); > > do_set(user_friendly_names, conf, user_friendly_names, > > "(config file setting)"); > > - do_default(user_friendly_names, USER_FRIENDLY_NAMES_OFF); > > + do_default(user_friendly_names, DEFAULT_USER_FRIENDLY_NAMES); > > out: > > condlog(3, "%s: user_friendly_names = %s %s", mp->wwid, > > (user_friendly_names == USER_FRIENDLY_NAMES_ON)? "yes" : > "no", > > -- > > 2.10.1 >
-- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
