martin f. krafft: prepare 3.1.4-1+8efb9d1
Martin F. Krafft
madduck at alioth.debian.org
Fri Sep 3 09:55:04 UTC 2010
Module: mdadm
Branch: build
Commit: 19c78042e0787a6fd7596c8f7cdaf7d262980d2c
URL: http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=19c78042e0787a6fd7596c8f7cdaf7d262980d2c
Author: martin f. krafft <madduck at debian.org>
Date: Fri Sep 3 11:07:25 2010 +0200
prepare 3.1.4-1+8efb9d1
Signed-off-by: martin f. krafft <madduck at debian.org>
---
Makefile | 6 ++--
ReadMe.c | 2 +-
debian/patches/fixes/linker-flag-z-now.diff | 28 +++++++++++++++++++++++++++
debian/patches/series | 1 +
mdadm.8.in | 14 +++++-------
mdadm.conf.5 | 2 +-
mdassemble.8 | 2 +-
udev-md-raid.rules | 13 +++++------
8 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/Makefile b/Makefile
index e2c65a5..1aab163 100644
--- a/Makefile
+++ b/Makefile
@@ -60,8 +60,8 @@ else
endif
SYSCONFDIR = /etc
-CONFFILE = $(SYSCONFDIR)/mdadm.conf
-CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
+CONFFILE = $(SYSCONFDIR)/mdadm/mdadm.conf
+CONFFILE2 = $(SYSCONFDIR)/mdadm.conf
MAILCMD =/usr/sbin/sendmail -t
CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
# Both MAP_DIR and MDMON_DIR should be somewhere that persists across the
@@ -167,7 +167,7 @@ mdmon.O2 : $(MON_SRCS) mdadm.h mdmon.h
# use '-z now' to guarantee no dynamic linker interactions with the monitor thread
mdmon : $(MON_OBJS)
- $(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
+ $(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
msg.o: msg.c msg.h
test_stripe : restripe.c mdadm.h
diff --git a/ReadMe.c b/ReadMe.c
index b97c55e..aa26032 100644
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -560,7 +560,7 @@ char Help_incr[] =
;
char Help_config[] =
-"The /etc/mdadm.conf config file:\n\n"
+"The /etc/mdadm/mdadm.conf config file:\n\n"
" The config file contains, apart from blank lines and comment lines that\n"
" start with a hash(#), four sorts of configuration lines: array lines, \n"
" device lines, mailaddr lines and program lines.\n"
diff --git a/debian/patches/fixes/linker-flag-z-now.diff b/debian/patches/fixes/linker-flag-z-now.diff
new file mode 100644
index 0000000..8aaac65
--- /dev/null
+++ b/debian/patches/fixes/linker-flag-z-now.diff
@@ -0,0 +1,28 @@
+From: martin f. krafft <madduck at debian.org>
+Subject: Fix compiler/linker flag in Makefile
+
+Cherry-pick 8efb9d1 from upstream to replace -z now with -Wl,-z,now
+
+Debian bug: #595290
+
+Signed-off-by: martin f. krafft <madduck at debian.org>
+
+---
+ Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e2c65a5..0cc9a87 100644
+--- a/Makefile
++++ b/Makefile
+@@ -167,7 +167,7 @@ mdmon.O2 : $(MON_SRCS) mdadm.h mdmon.h
+
+ # use '-z now' to guarantee no dynamic linker interactions with the monitor thread
+ mdmon : $(MON_OBJS)
+- $(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
++ $(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
+ msg.o: msg.c msg.h
+
+ test_stripe : restripe.c mdadm.h
+--
+tg: (ef9f23f..) fixes/linker-flag-z-now (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index c901f61..bd78dac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ contrib/docs/md.txt.diff -p1
contrib/docs/jd-rebuilding-raid.diff -p1
debian/conffile-location.diff -p1
debian/disable-incremental.diff -p1
+fixes/linker-flag-z-now.diff -p1
diff --git a/mdadm.8.in b/mdadm.8.in
index d911cb3..d267b8c 100644
--- a/mdadm.8.in
+++ b/mdadm.8.in
@@ -261,9 +261,9 @@ the exact meaning of this option in different contexts.
.TP
.BR \-c ", " \-\-config=
Specify the config file. Default is to use
-.BR /etc/mdadm.conf ,
-or if that is missing then
-.BR /etc/mdadm/mdadm.conf .
+.BR /etc/mdadm/mdadm.conf ,
+or if that is missing, then
+.BR /etc/mdadm.conf .
If the config file given is
.B "partitions"
then nothing will be read, but
@@ -1429,8 +1429,6 @@ The config file is only used if explicitly named with
or requested with (a possibly implicit)
.BR \-\-scan .
In the later case,
-.B /etc/mdadm.conf
-or
.B /etc/mdadm/mdadm.conf
is used.
@@ -1771,7 +1769,7 @@ or
.B \-\-scan
will cause the output to be less detailed and the format to be
suitable for inclusion in
-.BR /etc/mdadm.conf .
+.BR /etc/mdadm/mdadm.conf .
The exit status of
.I mdadm
will normally be 0 unless
@@ -1848,7 +1846,7 @@ or
is given, then multiple devices that are components of the one array
are grouped together and reported in a single entry suitable
for inclusion in
-.BR /etc/mdadm.conf .
+.BR /etc/mdadm/mdadm.conf .
Having
.B \-\-scan
@@ -2545,7 +2543,7 @@ uses this to find arrays when
is given in Misc mode, and to monitor array reconstruction
on Monitor mode.
-.SS /etc/mdadm.conf
+.SS /etc/mdadm/mdadm.conf
The config file lists which devices may be scanned to see if
they contain MD super block, and gives identifying information
diff --git a/mdadm.conf.5 b/mdadm.conf.5
index e677ba9..648d26a 100644
--- a/mdadm.conf.5
+++ b/mdadm.conf.5
@@ -8,7 +8,7 @@
.SH NAME
mdadm.conf \- configuration for management of Software RAID with mdadm
.SH SYNOPSIS
-/etc/mdadm.conf
+/etc/mdadm/mdadm.conf
.SH DESCRIPTION
.PP
.I mdadm
diff --git a/mdassemble.8 b/mdassemble.8
index 986432c..d06c201 100644
--- a/mdassemble.8
+++ b/mdassemble.8
@@ -40,7 +40,7 @@ There are no options to
.SH FILES
-.SS /etc/mdadm.conf
+.SS /etc/mdadm/mdadm.conf
The config file lists which devices may be scanned to see if
they contain MD super block, and gives identifying information
diff --git a/udev-md-raid.rules b/udev-md-raid.rules
index f9607f3..c9a4f0e 100644
--- a/udev-md-raid.rules
+++ b/udev-md-raid.rules
@@ -1,13 +1,13 @@
# do not edit this file, it will be overwritten on update
SUBSYSTEM!="block", GOTO="md_end"
-
-# handle potential components of arrays
-ENV{ID_FS_TYPE}=="linux_raid_member", ACTION=="remove", RUN+="/sbin/mdadm -If $name"
-ENV{ID_FS_TYPE}=="linux_raid_member", ACTION=="add", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
-
-# handle md arrays
ACTION!="add|change", GOTO="md_end"
+ACTION=="change", GOTO="md_no_incr"
+
+# import data from a raid member and activate it
+#ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
+# import data from a raid set
+LABEL="md_no_incr"
KERNEL!="md*", GOTO="md_end"
# partitions have no md/{array_state,metadata_version}, but should not
@@ -32,7 +32,6 @@ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNA
IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
OPTIONS+="link_priority=100"
-OPTIONS+="watch"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
More information about the pkg-mdadm-commits
mailing list