~xnox/ubuntu/quantal/mdadm/merge

« back to all changes in this revision

Viewing changes to inventory

  • Committer: Dmitrijs Ledkovs
  • Author(s): Surbhi Palande
  • Date: 2010-09-30 17:46:19 UTC
  • mfrom: (1.1.25 sid)
  • Revision ID: dmitrijs.ledkovs@canonical.com-20100930174619-cqsokylnluraiyr8
Tags: 3.1.4-1+8efb9d1ubuntu1
* Merge from debian unstable. (LP: #603582) 
* Remaining changes
  - Assemble.c, config.c: upgraded to the mdadm-3.1.4 version of these files
    from Debian.
  - debian/control: we need udev and util-linux in the right version. We
    also remove the build dependency from quilt and docbook-to-man as both
    are not used in Ubuntus mdadm.
  - debian/initramfs/hook: kept the Ubuntus version for handling the absence
    of active raid arrays in <initramfs>/etc/mdadm/mdadm.conf
  - debian/initramfs/script.local-top.DEBIAN, debian/mdadm-startall,
    debian/mdadm.raid.DEBIAN: removed. udev does its job now instead.
  - debian/mdadm-startall.sgml, debian/mdadm-startall.8: documentation of
    unused startall script
  - debian/mdadm.config, debian/mdadm.postinst - let udev do the handling
    instead. Resolved merge conflict by keeping Ubuntu's version.
  - debian/rules: kept debian's switch to using dh_lintian
  - debian/mdadm.links, debian/mdadm.manpages: dropped owing to the fact
    that these are not used in Ubuntu. Also dropped the build-dep on docbook
    to man)
  - debian/mdadm.postinst, debian/mdadm.config, initramfs/init-premount:
    boot-degraded enablement; maintain udev starting of RAID devices;
    init-premount hook script for the initramfs, to provide information at
    boot
  - debian/mkconf.in is the older mkconf. Kept the Ubuntus version.
  - debian/rules: Kept Ubuntus version for installing apport hooks, not
    installing un-used startall script and for adding a udev rule
    corresponding to mdadm.
  - debian/install-rc, check.d/_numbers, check.d/root_on_raid: Ubuntu partman
    installer changes
  - debian/presubj: Dropped this unused bug reporting file. Instead use
    source_mdadm.py act as an apport hook for bug handling.
  - rename debian/mdadm.vol_id.udev to debian/mdadm.mdadm-blkid.udev so that
    the rules file ends up with a more reasonable name

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
 
2
 
ANNOUNCE-2.0
3
 
ANNOUNCE-2.1
4
 
ANNOUNCE-2.2
5
 
ANNOUNCE-2.3
6
 
ANNOUNCE-2.3.1
7
 
ANNOUNCE-2.4
8
 
ANNOUNCE-2.4.1
9
 
ANNOUNCE-2.4-pre1
10
 
ANNOUNCE-2.5
11
 
ANNOUNCE-2.5.1
12
 
ANNOUNCE-2.5.2
13
 
ANNOUNCE-2.5.3
14
 
ANNOUNCE-2.5.4
15
 
ANNOUNCE-2.5.5
16
 
ANNOUNCE-2.5.6
17
 
ANNOUNCE-2.6
18
 
ANNOUNCE-2.6.1
19
 
ANNOUNCE-2.6.2
20
 
ANNOUNCE-2.6.3
21
 
ANNOUNCE-2.6.4
22
 
ANNOUNCE-2.6.5
23
 
ANNOUNCE-2.6.6
24
 
ANNOUNCE-2.6.7
25
 
ANNOUNCE-2.6.7.1
 
2
ANNOUNCE-3.0
 
3
ANNOUNCE-3.0.1
 
4
ANNOUNCE-3.0.2
 
5
ANNOUNCE-3.0.3
 
6
ANNOUNCE-3.1
 
7
ANNOUNCE-3.1.1
 
8
ANNOUNCE-3.1.2
 
9
ANNOUNCE-3.1.3
 
10
ANNOUNCE-3.1.4
26
11
Assemble.c
27
12
bitmap.c
28
13
bitmap.h
30
15
ChangeLog
31
16
config.c
32
17
COPYING
 
18
crc32.c
 
19
crc32.h
33
20
Create.c
34
21
Detail.c
35
22
dlink.c
43
30
kernel-patch-2.6.18
44
31
kernel-patch-2.6.18.6
45
32
kernel-patch-2.6.19
 
33
kernel-patch-2.6.25
 
34
kernel-patch-2.6.27
46
35
Kill.c
47
36
makedist
48
37
Makefile
49
38
Manage.c
 
39
managemon.c
50
40
mapfile.c
51
41
md.4
52
42
md5.h
53
 
mdadm.8
 
43
mdadm.8.in
54
44
mdadm.c
55
45
mdadm.conf.5
56
46
mdadm.conf-example
58
48
mdadm.spec
59
49
mdassemble.8
60
50
mdassemble.c
 
51
mdmon.8
 
52
mdmon.c
 
53
mdmon.h
61
54
mdopen.c
62
55
md_p.h
63
56
mdstat.c
65
58
misc/
66
59
misc/syslog-events
67
60
mkinitramfs
 
61
monitor.c
68
62
Monitor.c
 
63
msg.c
 
64
msg.h
 
65
platform-intel.c
 
66
platform-intel.h
 
67
probe_roms.c
 
68
probe_roms.h
69
69
pwgr.c
70
70
Query.c
71
71
raid5extend.c
72
72
ReadMe.c
73
73
README.initramfs
74
74
restripe.c
 
75
sg_io.c
75
76
sha1.c
76
77
sha1.h
77
78
super0.c
78
79
super1.c
 
80
super-ddf.c
 
81
super-intel.c
79
82
swap_super.c
80
83
sysfs.c
81
84
test
90
93
tests/00raid6
91
94
tests/01r1fail
92
95
tests/01r5fail
 
96
tests/01r5integ
 
97
tests/01raid6integ
93
98
tests/02lineargrow
94
99
tests/02r1add
95
100
tests/02r1grow
121
126
tests/06wrmostly
122
127
tests/07autoassemble
123
128
tests/07autodetect
 
129
tests/07changelevelintr
 
130
tests/07changelevels
 
131
tests/07layouts
 
132
tests/07reshape5intr
124
133
tests/07testreshape5
 
134
tests/08imsm-overlap
 
135
tests/09imsm-assemble
 
136
tests/09imsm-create-fail-rebuild
 
137
tests/10ddf-create
125
138
tests/check
 
139
tests/env-08imsm-overlap
 
140
tests/env-09imsm-assemble
 
141
tests/env-09imsm-create-fail-rebuild
126
142
tests/testdev
127
143
tests/ToTest
128
144
TODO
 
145
udev-md-raid.rules
129
146
util.c