Michael Tokarev: move runtime stuff from /dev/.mdadm to /run/mdadm

[Michael Tokarev]

Module: mdadm
Branch: master
Commit: e62ede1a85099c9515c3d902ada1948de993c90f
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=e62ede1a85099c9515c3d902ada1948de993c90f

Author: Michael Tokarev <mjt at tls.msk.ru>
Date:   Sat Sep 10 13:58:03 2011 +0400

move runtime stuff from /dev/.mdadm to /run/mdadm

Signed-off-by: Michael Tokarev <mjt at tls.msk.ru>

---

 debian/changelog |    1 +
 debian/rules     |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 978b513..3f2d7cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ mdadm (3.2.2-1) UNRELEASED; urgency=low
     thanks to Bernd Hanisch for the patch (Closes: #605722)
   * move initscript metadata from /lib/init/rw/.mdadm to /run/mdadm,
     and depend on initscripts (>= 2.88dsf-13.3) for /run (Closes: #633054)
+  * move runtime stuff from /dev/.mdadm to /run/mdadm
   * document defaults change in debian/NEWS (it was forgotten to be
     done for squeeze) - metadata & chunk size (Closes: #595516)
 
diff --git a/debian/rules b/debian/rules
index f5a8db1..31128fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@
 TG_BRANCHES="contrib/scripts/mdadd contrib/docs/raid5-vs-raid10 contrib/docs/superblock_formats contrib/docs/md.txt contrib/docs/jd-rebuilding-raid debian/conffile-location debian/disable-incremental fixes/linker-flag-z-now"
 -include /usr/share/topgit/tg2quilt.mk
 
+RUNDIR = /run/mdadm
+RUNOPTS = MAP_DIR=$(RUNDIR) MDMON_DIR=$(RUNDIR) FAILED_SLOTS_DIR=$(RUNDIR)/failed-slots
+
 CXFLAGS = -ggdb
 CXFLAGS_UDEB := $(CXFLAGS) -fomit-frame-pointer
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -36,14 +39,14 @@ build-stamp: debian/mdadm-startall.8
 mdadm.udeb: FLAGS = CXFLAGS="$(CXFLAGS_UDEB)" CONFFILE=/tmp/mdadm.conf
 mdadm.udeb: configure
 	dh_testdir
-	$(MAKE) $(FLAGS) all
+	$(MAKE) $(FLAGS) all $(RUNOPTS)
 	mv mdadm mdadm.udeb
 .PHONY: mdadm.udeb
 
 mdadm: FLAGS = CXFLAGS="$(CXFLAGS)" CONFFILE=/etc/mdadm/mdadm.conf CONFFILE2=/etc/mdadm.conf
 mdadm: configure
 	dh_testdir
-	$(MAKE) $(FLAGS) all
+	$(MAKE) $(FLAGS) all $(RUNOPTS)
 .PHONY: mdadm
 
 INTERPOLATED_FILES = debian/bugscript debian/mkconf