lp://staging/~xnox/ubuntu/quantal/mdadm/merge
- Get this branch:
- bzr branch lp://staging/~xnox/ubuntu/quantal/mdadm/merge
Branch merges
- Dimitri John Ledkov: Pending requested
-
Diff: 24674 lines (+7902/-9243)110 files modified.pc/applied-patches (+0/-3)
.pc/debian-changes-3.1.4-1+8efb9d1ubuntu4/Assemble.c (+0/-1650)
.pc/debian-changes-3.1.4-1+8efb9d1ubuntu4/ReadMe.c (+0/-602)
.pc/debian-changes-3.1.4-1+8efb9d1ubuntu4/config.c (+0/-1131)
.pc/debian-conffile-location.diff/Makefile (+287/-0)
.pc/debian-conffile-location.diff/ReadMe.c (+608/-0)
.pc/debian-conffile-location.diff/mdadm.8.in (+2899/-0)
.pc/debian-conffile-location.diff/mdadm.conf.5 (+581/-0)
.pc/debian-conffile-location.diff/mdassemble.8 (+65/-0)
.pc/debian-no-Werror.diff/Makefile (+287/-0)
.pc/debian/conffile-location.diff/Makefile (+0/-286)
.pc/debian/conffile-location.diff/ReadMe.c (+0/-602)
.pc/debian/conffile-location.diff/mdadm.8.in (+0/-2880)
.pc/debian/conffile-location.diff/mdadm.conf.5 (+0/-581)
.pc/debian/conffile-location.diff/mdassemble.8 (+0/-65)
.pc/debian/no-Werror.diff/Makefile (+0/-286)
.pc/sha1-includes.diff/sha1.h (+141/-0)
ANNOUNCE-3.2.4 (+144/-0)
ANNOUNCE-3.2.5 (+31/-0)
Assemble.c (+72/-23)
Create.c (+14/-4)
Detail.c (+8/-7)
Grow.c (+288/-84)
Incremental.c (+6/-8)
Makefile (+7/-6)
Manage.c (+94/-51)
Monitor.c (+19/-12)
ReadMe.c (+7/-1)
check.d/_numbers (+0/-1)
check.d/root_on_raid (+0/-35)
config.c (+6/-6)
debian/README.source (+0/-18)
debian/changelog (+102/-0)
debian/checkarray (+15/-0)
debian/control (+1/-1)
debian/initramfs/local-premount (+1/-0)
debian/mdadm.logcheck.ignore.server (+1/-1)
debian/patches/debian-conffile-location.diff (+126/-0)
debian/patches/debian-disable-udev-incr-assembly.diff (+27/-0)
debian/patches/debian-no-Werror.diff (+26/-0)
debian/patches/debian/conffile-location.diff (+0/-128)
debian/patches/debian/disable-udev-incr-assembly.diff (+0/-29)
debian/patches/debian/no-Werror.diff (+0/-28)
debian/patches/series (+4/-3)
debian/patches/sha1-includes.diff (+45/-0)
debian/po/ca.po (+7/-7)
debian/po/cs.po (+7/-7)
debian/po/da.po (+7/-7)
debian/po/de.po (+7/-7)
debian/po/es.po (+7/-7)
debian/po/eu.po (+7/-7)
debian/po/fi.po (+6/-6)
debian/po/fr.po (+7/-7)
debian/po/gl.po (+7/-7)
debian/po/it.po (+7/-7)
debian/po/ja.po (+7/-7)
debian/po/nl.po (+7/-7)
debian/po/pt.po (+7/-7)
debian/po/pt_BR.po (+39/-7)
debian/po/ru.po (+7/-7)
debian/po/sk.po (+7/-7)
debian/po/sv.po (+7/-7)
debian/po/templates.pot (+2/-2)
debian/po/vi.po (+7/-7)
debian/rules (+7/-17)
debian/source_mdadm.py (+5/-7)
inventory (+28/-26)
lib.c (+7/-2)
makedist (+4/-2)
managemon.c (+6/-0)
mapfile.c (+6/-11)
mdadm.8.in (+42/-23)
mdadm.c (+24/-6)
mdadm.conf-example (+1/-1)
mdadm.conf.5 (+1/-1)
mdadm.h (+38/-14)
mdadm.spec (+2/-2)
mdassemble.8 (+1/-1)
mdmon.8 (+13/-3)
mdmon.c (+48/-11)
mdopen.c (+1/-1)
monitor.c (+20/-16)
msg.c (+10/-0)
msg.h (+1/-0)
platform-intel.h (+1/-0)
sha1.c (+42/-49)
sha1.h (+64/-12)
super-ddf.c (+25/-16)
super-intel.c (+1159/-189)
super0.c (+18/-12)
super1.c (+169/-102)
sysfs.c (+13/-4)
test (+6/-5)
tests/00raid1 (+2/-2)
tests/05r1-bitmapfile (+3/-3)
tests/05r1-grow-external (+2/-2)
tests/05r1-grow-internal (+2/-2)
tests/05r1-grow-internal-1 (+2/-2)
tests/05r1-internalbitmap (+3/-3)
tests/05r1-internalbitmap-v1a (+3/-3)
tests/05r1-internalbitmap-v1b (+3/-3)
tests/05r1-internalbitmap-v1c (+3/-3)
tests/05r1-n3-bitmapfile (+3/-3)
tests/05r1-re-add (+2/-2)
tests/06wrmostly (+2/-2)
tests/07autoassemble (+4/-4)
tests/09imsm-assemble (+3/-3)
tests/09imsm-create-fail-rebuild (+1/-1)
tests/10ddf-create (+1/-1)
util.c (+30/-12)
Related bugs
Bug #920324: Please merge mdadm 3.2.3-2 from Debian unstable (main) (multiple regressions) | High | Fix Released | |
Bug #942106: software raid doesn't assemble before mount on boot | High | Fix Released | |
Bug #957494: Missing added utility 'mdmon' | Medium | Fix Released | |
Bug #968074: Partitionable raid ignored by 65-mdadm-blkid.rules | Undecided | Fix Released | |
Bug #969384: mdadm --detail --scan segfaults during update-initramfs | Critical | Fix Released | |
Bug #1002357: sort out udev rules madness (3 editions installed into 4 files) | Undecided | Fix Released | |
Bug #1013171: Many package hooks not ported to python3 | Medium | Fix Released |
Related blueprints
Branch information
- Owner:
- Dimitri John Ledkov
- Status:
- Development
Recent revisions
- 77. By Dimitri John Ledkov
-
* Additional Ubuntu changes:
- debian/initramfs/ local-premount: add call wait_for_udev to wait a
little longer for RAID devices to appear (LP: #942106) - 76. By Dimitri John Ledkov
-
* New upstream releases closes these bugs:
- mdadm --detail --scan segfaults during update-initramfs (LP: #969384) - 75. By Dimitri John Ledkov
-
Revert pointless changes to hook, it needs proper rebase on top of debian
- 73. By Dimitri John Ledkov
-
* Changes to ubuntu additions:
- debian/source_ mdadm.py: make apport hook python 2 and 3 compatible
(LP: #1013171). - 72. By Dimitri John Ledkov
-
* Merge from Debian testing. (LP: #920324) Remaining changes:
- Call checks in local-premount to avoid race condition with udev
and opening a degraded array.
- d/initramfs/mdadm-functions : Record in /run when boot-degraded
question has been asked so that it is only asked once
- pass --test to mdadm to enable result codes for degraded arrays.
- 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/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 Ubuntu version.
- debian/rules: Kept Ubuntus version for installing apport hooks, not
installing un-used startall script.
- 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.
- d/p/debian-changes- 3.1.4-1+ 8efb9d1ubuntu4: mdadm udev rule
incrementally adds mdadm member when detected. Starting such an
array in degraded mode is possible by mdadm -IRs. Using mdadm
-ARs without stopping the array first does nothing when no
mdarray-unassociated device is available. Using mdadm -IRs to
start a previously partially assembled array through incremental
mode. Keeping the mdadm -ARs for assembling arrays which were for
some reason not assembled through incremental mode (i.e through
mdadm's udev rule).
* Dropped changes:
- Build udeb with -O2 on ppc64, working around a link error. Builds
fine without it on debian.
- rename debian/mdadm.vol_ id.udev to debian/ mdadm.mdadm- blkid.udev so
that the rules file ends up with a more reasonable name. debian/rules
changes for adding ubuntu's udev rule corresponding to mdadm. As we
are now using 'upstream' udev rules see 3.2.3-2ubuntu2.* new upstream (bugfix) release, fixing regression when --add'ing
device to an array, introduced in 3.2.4, plus other minor fixes
(Closes: #673104, #673344)
* new patch: sha1-includes.diff to fix #include mess in new sha1.h
* added a check into debian/checkarray to skip checking arrays created
less than 2 weeks ago (Closes: #624273)
* Remove obsolete documentation dating back to ~etch release
* Remove reference to obsolete documention from debconf templates
* Update debconf templates translations
* Remove compatability with acient initramfs-tools
* Remove debian-specific mdadm-startall.8 in clean target
* new upstream (bugfix) release (Closes: #664088, #661552)
* removed debian-run-udev. diff (applied upstream), and
all RUNDIR handling from debian/rules (it is the default now)
* add build-arch and build-indep targets to debian/rules, and
bump Standards-Version to 3.9.3
* switch from topgit to plain 3.0 (quilt) layout, creating
debian/patches. Don't build-depend on quilt as patching
is done automatically by dpkg-source.
* debian/patches/ debian- run-udev. diff by Roger Leigh (Closes: #644319, #627774)
* update debian/mdadm.logcheck. ignore. server to recognize "k" in
addition of "blocks" in kernel messages. Thanks to Frédéric Brière
for the patch (Closes: #656038) - 69. By Dimitri John Ledkov
-
debian/
patches/ series: Remove `disable- udev-incr- assembly. diff' to
enable incremental assembly, now that we are using upstream rules & we
always had incremental assembly enabled.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)