[4/4] multipath-tools: change default location for bindings file

Commit Message

Mike Snitzer April 17, 2009, 10:08 p.m. UTC

Change from /var/lib/multipath/bindings to /etc/multipath/bindings.  On
bootup, if /var is not on the same device as /, multipath may start up
before /var is mounted.  /etc will always be available.  Use of
/etc/multipath/ is to make selinux happy.

Signed-off-by: Mike Snitzer <[e-mail]>
---
 libmultipath/defaults.h |    2 +-
 multipath/Makefile      |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
index d7f93cb..4bd0a8b 100644
--- a/libmultipath/defaults.h
+++ b/libmultipath/defaults.h
@@ -18,6 +18,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/Makefile b/multipath/Makefile
index e0031a2..1f48a8f 100644
--- a/multipath/Makefile
+++ b/multipath/Makefile
@@ -27,6 +27,7 @@  install:
 	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
 	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
+	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/multipath
 
 uninstall:
 	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules