Last commit made on 2016-04-11
Get this branch:
git clone -b ubuntu/xenial https://git.launchpad.net/ubuntu/+source/mdadm
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

232b571... by Simon D├ęziel on 2016-04-11

Import patches-unapplied version 3.3-2ubuntu7 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: a88b170484cd61af8ab40ea9d3282bc63bc2802c

New changelog entries:
  * Do not start when inside a container (LP: #1568993)

a88b170... by Adam Conrad on 2016-03-24

Import patches-unapplied version 3.3-2ubuntu6 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 48dbec1a3174e0977dfe4426e86a89342085cd7f

New changelog entries:
  * debian/cotrol: Drop MTA Recommends to a Suggests (LP #1549319)

48dbec1... by Dimitri John Ledkov on 2016-02-19

Import patches-unapplied version 3.3-2ubuntu5 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 1295eb01980c731a8bd4e017a1a3631e7039234e

New changelog entries:
  * Drop grub override, and thus use mdadm to assemble ISMS and DDF raids.

1295eb0... by Andy Whitcroft on 2016-02-17

Import patches-unapplied version 3.3-2ubuntu4 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 7283ec5cdc523826114c54ff8d1fd4a367f4a556

New changelog entries:
  * debian/control: recommend kmod in preference to module-init-tools.

7283ec5... by Martin Pitt on 2015-12-11

Import patches-unapplied version 3.3-2ubuntu3 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: d61c932692fcb978ccb1b03ac995ee3d3fde62c6

New changelog entries:
  * debian/mdadm.init: Stop depending on mdadm-raid, as we removed that init
    script in Ubuntu in favor of udev rules.

d61c932... by Iain Lane on 2015-06-16

Import patches-unapplied version 3.3-2ubuntu2 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 726b79a59db9239b43655da9ddd3026833989039

New changelog entries:
  * debian/dmraid2mdadm.cfg: Only append to GRUB_CMDLINE_LINUX_DEFAULT one
    time. (LP: #1465567)

726b79a... by Dimitri John Ledkov on 2014-07-17

Import patches-unapplied version 3.3-2ubuntu1 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 0b7b70fb375275a32105fad510d63d39f3099e64

New changelog entries:
  * Merge from Debian unstable, remaining changes:
    - debian/initramfs/mdadm-functions: add call wait_for_udev to wait a
      little longer for RAID devices to appear.
    - 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/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/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).
    - Take kernel cmdline parameters "nomdmonisw" and "nomdmonddf" into
      account, when assembling imsm/ddf arrays. This defaults to assembling
      those arrays using mdmon/mdadm, with a fallback to dmraid upon
    - Use default/grub.d snippet to continue using dmraid to assemble
      fakeraid arrays.

  * Install incremental assembly rules.
  * Disable use-external-blkid.diff, udev in Ubuntu is recent enough.

0b7b70f... by Michael Tokarev <email address hidden> on 2013-10-14

Import patches-unapplied version 3.3-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9c5f08e676c9854de188a54b8e477ca107eae86d

New changelog entries:
  * use 63-md-raid-arrays.rules instead of old 64-md-raid.rules
    (Closes: #726237)
  * do not use builtin blkid in udev rules, as our udev (at least
    on wheezy) does not have it (use-external-blkid.diff)

9c5f08e... by Michael Tokarev <email address hidden> on 2013-10-11

Import patches-unapplied version 3.3-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 4a4e40d1d7afb3a19ed3ee76eb656f9fce4efb28

New changelog entries:
  [ Michael Tokarev ]
  * new upstream 3.3 release (Closes: #718896)
    See ANNOUNCE-3.3 for details.
    - refreshed debian-conffile-location.diff
      (added .conf.d)
    - removed debian-disable-udev-incr-assembly.diff
      (do not ship udev-md-raid-assembly.rules for now)
    - refreshed debian-no-Werror.diff
    - refreshed sha1-includes.diff
    - removed patches (included upstream)A:
    Install udev-md-raid-arrays.rules instead of udev-md-raid.rules,
    don't install new udev-md-raid-assembly.rules for now.
  * remove Martin F. Krafft from uploaders per his request.
    Thank you for your contributions!
  * added remove-bashism-from-makefile.patch patch to work around
    newly introduced bashism
  * remove debian/source/options, there's no need to set compression
    options for debian.tar.gz.
  * remove outdated debian/docs/md_superblock_formats.txt and
    debian/docs/md.txt (Closes: #714977, #714978)
  * ship ANNOUNCE-*, external-reshape-design.txt, mdmon-design.txt
    files as documentation (Closes: #715324)
  [ Dmitrijs Ledkovs ]
  * Properly remove 65-mdadm.vol_id.rules, instead of trying to remove a
    never-existed 65_mdadm.vol_id.rules (note the 65- vs 65_).
  * replace home-grown and not-working-since-etch udevsettle call
    in initramfs script with proper wait_for_udev function (from
    common initramfs functions). This unbreaks situations when
    the underlying device needs some udev magic to happen before
    being available, which includes stacked devices (md on lvm)
    and other cases. Thanks to Thomas Parmelan and Dave Whitla
    for finding the root cause of breakage and for providing
    the fix. (Closes: #644876)

4a4e40d... by Michael Tokarev <email address hidden> on 2013-01-24

Import patches-unapplied version 3.2.5-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7e438de016d1f940274e2ed053cd2549c2db0b38

New changelog entries:
  * add (empty) restart and force-reload actions to mdadm-waitidle
    script -- this script is used only when the system needs to be
    shut down or rebooted, there's nothing to start or restart.