From patchwork Fri Apr 17 22:08:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Snitzer X-Patchwork-Id: 18764 X-Patchwork-Delegate: christophe.varoqui@free.fr Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3HM89ef031172 for ; Fri, 17 Apr 2009 22:08:12 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 5BD3661ADA9; Fri, 17 Apr 2009 18:08:10 -0400 (EDT) Received: from int-mx2.corp.redhat.com ([172.16.27.26]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n3HM83pD030800 for ; Fri, 17 Apr 2009 18:08:04 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n3HM83Ux017076 for ; Fri, 17 Apr 2009 18:08:03 -0400 Received: from localhost (dhcp-100-18-152.bos.redhat.com [10.16.18.152]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n3HM827P006240 for ; Fri, 17 Apr 2009 18:08:03 -0400 From: Mike Snitzer To: dm-devel@redhat.com Date: Fri, 17 Apr 2009 18:08:00 -0400 Message-Id: <1240006080-27892-5-git-send-email-snitzer@redhat.com> In-Reply-To: <1240006080-27892-1-git-send-email-snitzer@redhat.com> References: <1240006080-27892-1-git-send-email-snitzer@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-loop: dm-devel@redhat.com Subject: [dm-devel] [PATCH 4/4] multipath-tools: change default location for bindings file X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com 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 --- libmultipath/defaults.h | 2 +- multipath/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) 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