~yofel/ubuntu/quantal/btrfs-tools/merge-894456

Viewing all changes in revision 31.

  • Committer: Dmitrijs Ledkovs
  • Author(s): Philip Muškovac
  • Date: 2012-05-21 10:56:12 UTC
  • Revision ID: dmitrijs.ledkovs@canonical.com-20120521105612-ez9lh64zl0f2o21p
* Merge from debian (LP: #894456), remaining changes:
  - 07-allow-fsck-options.patch:
    + Make fsck.btrfs not fail when called with fsck options.
  - btrfs-tools-udeb.install:
    + ship btrfs in the udeb.
  - btrfs-tools.links:
    + make fsck.btrfs a symlink to /bin/true.
      As btrfsck fails on mounted / on boot, and still doesn't fix
      anything by default it doesn't make any sense to run it
      regularly on boot.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: