Codebase list mdadm / debian/3.4-1
Drop use-tempnode-not-devnode.patch, not needed anymore. * Drop use-tempnode-not-devnode.patch, not needed anymore. * Drop use-external-blkid.diff. (Closes: #793631) Dimitri John Ledkov 8 years ago
14 changed file(s) with 34 addition(s) and 78 deletion(s). Raw diff Collapse all Expand all
+3
-3
Makefile less more
4242
4343 CC = $(CROSS_COMPILE)gcc
4444 CXFLAGS ?= -ggdb
45 CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
45 CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
4646 ifdef WARN_UNUSED
4747 CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3
4848 endif
6161 PKG_CONFIG ?= pkg-config
6262
6363 SYSCONFDIR = /etc
64 CONFFILE = $(SYSCONFDIR)/mdadm.conf
65 CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
64 CONFFILE = $(SYSCONFDIR)/mdadm/mdadm.conf
65 CONFFILE2 = $(SYSCONFDIR)/mdadm.conf
6666 MAILCMD =/usr/sbin/sendmail -t
6767 CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
6868 # Both MAP_DIR and MDMON_DIR should be somewhere that persists across the
+1
-1
ReadMe.c less more
598598 ;
599599
600600 char Help_config[] =
601 "The /etc/mdadm.conf config file:\n\n"
601 "The /etc/mdadm/mdadm.conf config file:\n\n"
602602 " The config file contains, apart from blank lines and comment lines that\n"
603603 " start with a hash(#), array lines, device lines, and various\n"
604604 " configuration lines.\n"
+3
-0
debian/changelog less more
00 mdadm (3.4-1) unstable; urgency=medium
11
22 * New upstream release.
3 * Drop use-tempnode-not-devnode.patch, not needed anymore.
4 * Drop use-external-blkid.diff. (Closes: #793631)
5 * Refresh patches.
36
47 -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 19 Feb 2016 16:18:36 +0000
58
+7
-5
debian/patches/disable-incremental-assembly.patch less more
0 --- a/udev-md-raid-assembly.rules
1 +++ b/udev-md-raid-assembly.rules
0 Index: mdadm/udev-md-raid-assembly.rules
1 ===================================================================
2 --- mdadm.orig/udev-md-raid-assembly.rules
3 +++ mdadm/udev-md-raid-assembly.rules
24 @@ -25,6 +25,9 @@ GOTO="md_inc_end"
3
5
46 LABEL="md_inc"
5
7
68 +# Disable incremental assembly to fix Debian bug #784070
79 +GOTO="md_inc_end"
810 +
911 # remember you can limit what gets auto/incrementally assembled by
1012 # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
11 ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $tempnode --offroot ${DEVLINKS}"
13 ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot ${DEVLINKS}"
+0
-2
debian/patches/series less more
00 debian-conffile-location.diff
11 debian-no-Werror.diff
22 sha1-includes.diff
3 use-external-blkid.diff
4 use-tempnode-not-devnode.patch
53 readlink-path.patch
64 mdmonitor-service-simplify.diff
75 disable-incremental-assembly.patch
+0
-16
debian/patches/use-external-blkid.diff less more
0 From: Michael Tokarev <mjt@tls.msk.ru>
1 Subject: blkid is not udev builtin, use /sbin/blkid
2
3 --- a/udev-md-raid-arrays.rules
4 +++ b/udev-md-raid-arrays.rules
5 @@ -26,9 +26,7 @@ ENV{DEVTYPE}=="partition", ENV{MD_UUID}=
6 ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
7 ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
8
9 -IMPORT{builtin}="blkid"
10 -OPTIONS+="link_priority=100"
11 -OPTIONS+="watch"
12 +IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"
13 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
14 ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
15
+0
-31
debian/patches/use-tempnode-not-devnode.patch less more
0 From: Michael Tokarev <mjt@tls.msk.ru>
1 Subject: use tempnode not devnode in udev rules
2 Bug-Debian: http://bugs.debian.org/770883
3 Forwarded: no
4
5 udev in wheezy does not understand $devnode construct
6 in rules file, while upstream uses it in mdadm rules
7 files. udev in jessie has $devnode and it also supports
8 old $tempnode which is the way it worked in wheezy and
9 before, even if $tempnode in jessie's udev is not documented.
10 So on jessie, both $tempnode and $devnode works fine, while
11 in wheezy, only $tempnode works.
12
13 Use $tempnode instead of $devnode. Since mdadm is important
14 enough for system functionality and easily can break system
15 by making it unbootable, and this is the only incompatibility
16 between wheezy's and jessie's udev wrt mdadm, it is better than
17 having a versioned dependency on udev.
18
19 This patch is debian-specific and should be dropped for jessie+1.
20
21 --- a/udev-md-raid-arrays.rules
22 +++ b/udev-md-raid-arrays.rules
23 @@ -20 +20 @@
24 -IMPORT{program}="BINDIR/mdadm --detail --export $devnode"
25 +IMPORT{program}="BINDIR/mdadm --detail --export $tempnode"
26 --- a/udev-md-raid-assembly.rules
27 +++ b/udev-md-raid-assembly.rules
28 @@ -30 +30 @@
29 -ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot ${DEVLINKS}"
30 +ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $tempnode --offroot ${DEVLINKS}"
+9
-9
mdadm.8.in less more
266266 .TP
267267 .BR \-c ", " \-\-config=
268268 Specify the config file or directory. Default is to use
269 .B /etc/mdadm/mdadm.conf
270 and
271 .BR /etc/mdadm/mdadm.conf.d ,
272 or if those are missing then
269273 .B /etc/mdadm.conf
270274 and
271 .BR /etc/mdadm.conf.d ,
272 or if those are missing then
273 .B /etc/mdadm/mdadm.conf
274 and
275 .BR /etc/mdadm/mdadm.conf.d .
275 .BR /etc/mdadm.conf.d .
276276 If the config file given is
277277 .B "partitions"
278278 then nothing will be read, but
18481848 or requested with (a possibly implicit)
18491849 .BR \-\-scan .
18501850 In the later case,
1851 .B /etc/mdadm/mdadm.conf
1852 or
18511853 .B /etc/mdadm.conf
1852 or
1853 .B /etc/mdadm/mdadm.conf
18541854 is used.
18551855
18561856 If
31443144 is given in Misc mode, and to monitor array reconstruction
31453145 on Monitor mode.
31463146
3147 .SS /etc/mdadm.conf
3147 .SS /etc/mdadm/mdadm.conf (or /etc/mdadm.conf)
31483148
31493149 The config file lists which devices may be scanned to see if
31503150 they contain MD super block, and gives identifying information
31523152 .BR mdadm.conf (5)
31533153 for more details.
31543154
3155 .SS /etc/mdadm.conf.d
3155 .SS /etc/mdadm/mdadm.conf.d (or /etc/mdadm.conf.d)
31563156
31573157 A directory containing configuration files which are read in lexical
31583158 order.
+1
-1
mdadm.conf.5 less more
77 .SH NAME
88 mdadm.conf \- configuration for management of Software RAID with mdadm
99 .SH SYNOPSIS
10 /etc/mdadm.conf
10 /etc/mdadm/mdadm.conf
1111 .SH DESCRIPTION
1212 .PP
1313 .I mdadm
+1
-1
mdassemble.8 less more
3939
4040 .SH FILES
4141
42 .SS /etc/mdadm.conf
42 .SS /etc/mdadm/mdadm.conf
4343
4444 The config file lists which devices may be scanned to see if
4545 they contain MD super block, and gives identifying information
+4
-4
sha1.h less more
2121
2222 #include <stdio.h>
2323
24 #if defined HAVE_LIMITS_H || _LIBC
24 #if 1 /* defined HAVE_LIMITS_H || _LIBC */
2525 # include <limits.h>
2626 #endif
2727
3232 the resulting executable. Locally running cross-compiled executables
3333 is usually not possible. */
3434
35 #ifdef _LIBC
36 # include <sys/types.h>
37 typedef u_int32_t sha1_uint32;
35 #if 1 /* def _LIBC */
36 # include <stdint.h>
37 typedef uint32_t sha1_uint32;
3838 typedef uintptr_t sha1_uintptr;
3939 #else
4040 # define INT_MAX_32_BITS 2147483647
+1
-4
systemd/mdmonitor.service less more
99 DefaultDependencies=no
1010
1111 [Service]
12 Environment= MDADM_MONITOR_ARGS=--scan
13 EnvironmentFile=-/run/sysconfig/mdadm
14 ExecStartPre=-/usr/lib/systemd/scripts/mdadm_env.sh
15 ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
12 ExecStart=BINDIR/mdadm --monitor --scan
+1
-1
udev-md-raid-arrays.rules less more
3434 ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service"
3535
3636 # Tell systemd to run mdmon for our container, if we need it.
37 ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
37 ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
3838 ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
3939
4040 LABEL="md_end"
+3
-0
udev-md-raid-assembly.rules less more
2424
2525 LABEL="md_inc"
2626
27 # Disable incremental assembly to fix Debian bug #784070
28 GOTO="md_inc_end"
29
2730 # remember you can limit what gets auto/incrementally assembled by
2831 # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
2932 ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot ${DEVLINKS}"