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

Created by Philip Muškovac on 2012-05-21 and last modified on 2012-05-21
Get this branch:
bzr branch lp:~yofel/ubuntu/quantal/btrfs-tools/merge-894456
Only Philip Muškovac can upload to this branch. If you are Philip Muškovac please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Philip Muškovac
Status:
Development

Recent revisions

34. By Philip Muškovac on 2012-05-21

re-add btrfsck -> fsck.btrfs symlink

33. By Philip Muškovac on 2012-05-21

07-allow-fsck-options.patch:
 Instead of failing on fsck options, just print the version and exit

32. By Dimitri John Ledkov on 2012-05-21

* Documented Dropped changes.
* 'Rebased' on top of -2

31. By Philip Muškovac on 2012-05-21

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

30. By Dimitri John Ledkov on 2012-05-21

Merge with resolve --take-other everything from debian

29. By Dimitri John Ledkov on 2012-05-21

Merging shared upstream rev into target branch.

28. By Colin Watson on 2011-08-25

releasing version 0.19+20100601-3ubuntu3

27. By Colin Watson on 2011-08-25

Fix -Wunused-but-set-variable warnings from GCC 4.6 (LP: #829428).

26. By Loïc Minier on 2011-03-30

* New patch, ignore all arguments starting with "-" as to be compatible with
  the way mountall and other programs call fsck.btrfs (for instance with
  -a); this helps checking of btrfs filesystems by mountall on boot, but the
  proper fix would be to implement support for these flags; patch by
  Sten Heinze found in Debian #567681; LP: #460246.
* Re-add fsck.btrfs -> btrfsck symlink; LP: #660649.

25. By Michael Vogt on 2011-01-14

* btrfs-tools-udeb.install:
  - ship /sbin/btrfs in the udeb
* debian/patches/04-werror.patch:
  - fix missing initialization (fixes FTBFS)
* debian/patches/05-fix-ld.patch:
  - add missing -lcom_err to fix FTBFS

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/quantal/btrfs-tools
This branch contains Public information 
Everyone can see this information.

Subscribers