multipath: move bindings file location

The current bindings file location (/var/lib/multipath/bindings) can be
problematic, since multipath can start up before /var/lib is mounted yet in
late boot.  In this case, multipath will create it's own bindings file which
will be covered up by /var when it is mounted.  This means that the device
names that you get on startup might be different from the device names that you
get when you run multipath on a system during normal operation.  Since /etc is
always available when multipath starts up in late boot, moving the bindings
file there fixes the problem.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>

diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
index 84e5d6b..5a38d25 100644 (file)
--- a/libmultipath/defaults.h
+++ b/libmultipath/defaults.h
@@ -19,6 +19,6 @@
 #define DEFAULT_PIDFILE                "/var/run/multipathd.pid"
 #define DEFAULT_SOCKET         "/var/run/multipathd.sock"
 #define DEFAULT_CONFIGFILE     "/etc/multipath.conf"
-#define DEFAULT_BINDINGS_FILE  "/var/lib/multipath/bindings"
+#define DEFAULT_BINDINGS_FILE  "/etc/multipath/bindings"
 
 char * set_default (char * str);

diff --git a/multipath.conf.annotated b/multipath.conf.annotated
index 6532622..4bbdf28 100644 (file)
--- a/multipath.conf.annotated
+++ b/multipath.conf.annotated
@@ -165,7 +165,7 @@
 #      # name    : user_friendly_names
 #      # scope   : multipath
 #      # desc    : If set to "yes", using the bindings file
-#      #           /var/lib/multipath/bindings to assign a persistent and
+#      #           /etc/multipath/bindings to assign a persistent and
 #      #           unique alias to the multipath, in the form of mpath<n>.
 #      #           If set to "no" use the WWID as the alias. In either case
 #      #           this be will be overriden by any specific aliases in this

diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
index 1dc1488..165982e 100644 (file)
--- a/multipath/multipath.conf.5
+++ b/multipath/multipath.conf.5
@@ -224,7 +224,7 @@ for never stop queueing. Default is 0.
 If set to 
 .I yes
 , using the bindings file
-.I /var/lib/multipath/bindings
+.I /etc/multipath/bindings
 to assign a persistent and unique alias to the multipath, in the form of mpath<n>.
 If set to 
 .I no