ubuntu/+source/mdadm:applied/ubuntu/utopic-proposed

Last commit made on 2014-07-17
Get this branch:
git clone -b applied/ubuntu/utopic-proposed 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

Name:
applied/ubuntu/utopic-proposed
Repository:
lp:ubuntu/+source/mdadm

Recent commits

0658ca9... by Dimitri John Ledkov on 2014-07-17

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

Imported using git-ubuntu import.

Changelog parent: 84e85bc6ad20d87e9d039d7ca5fad275c5d8d47d
Unapplied parent: ee6a555ebc074c46caf02c18d9929d4f004644e4

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
      request.
    - 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.

ee6a555... by Dimitri John Ledkov on 2014-07-17

fallback to dmraid fakeraid assembly, if requested

Gbp-Pq: dmraid-fallback.patch.

f701553... by Dimitri John Ledkov on 2014-07-17

Remove bashism from Makefile

Gbp-Pq: remove-bashism-from-makefile.patch.

125e6f5... by Dimitri John Ledkov on 2014-07-17

do not #include ansidecl.h from sha1.h, use system headers

Gbp-Pq: sha1-includes.diff.

cebb85b... by Dimitri John Ledkov on 2014-07-17

Upstream changes introduced in version 3.1.4-1+8efb9d1ubuntu4

Gbp-Pq: debian-changes-3.1.4-1+8efb9d1ubuntu4.

feb29fe... by Dimitri John Ledkov on 2014-07-17

Remove -Werror from compiler flags

Gbp-Pq: debian-no-Werror.diff.

087dfe3... by Dimitri John Ledkov on 2014-07-17

Set /etc/mdadm/mdadm.conf as primary config file location

Gbp-Pq: debian-conffile-location.diff.

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
      request.
    - 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.

84e85bc... by Michael Tokarev <email address hidden> on 2013-10-14

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

Imported using git-ubuntu import.

Changelog parent: efcfc206733184631a6468566a44faedc20b8aaf
Unapplied parent: f7ba98daeda021486248db6535b730e89ba00417

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)

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)