multipath-tools: replace hardcoded USER_FRIENDLY_NAMES_OFF by default
authorXose Vazquez Perez <xose.vazquez@gmail.com>
Tue, 18 Oct 2016 13:22:45 +0000 (15:22 +0200)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Wed, 19 Oct 2016 06:07:55 +0000 (08:07 +0200)
Cc: Benjamin Marzinski <bmarzins@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
libmultipath/defaults.h
libmultipath/propsel.c

index d00a86f..e9581a6 100644 (file)
@@ -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)
index 88a1916..aaf99fb 100644 (file)
@@ -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",