lp:~xnox/ubuntu/quantal/btrfs-tools/merge
- Get this branch:
- bzr branch lp:~xnox/ubuntu/quantal/btrfs-tools/merge
Branch merges
- Dave Walker (community): Needs Fixing
- Steve Langasek: Pending requested
- Ubuntu branches: Pending requested
-
Diff: 28755 lines (+21659/-3327)102 files modified.hgignore (+0/-1)
.hgtags (+0/-15)
.pc/.version (+1/-0)
.pc/01-labels.patch/mkfs.c (+1463/-0)
.pc/02-ftbfs.patch/convert.c (+2812/-0)
.pc/03-manpage.patch/man/btrfs-image.8.in (+34/-0)
.pc/03-manpage.patch/man/btrfs-show.8.in (+22/-0)
.pc/03-manpage.patch/man/btrfs.8.in (+322/-0)
.pc/03-manpage.patch/man/btrfsck.8.in (+17/-0)
.pc/03-manpage.patch/man/btrfsctl.8.in (+48/-0)
.pc/03-manpage.patch/man/mkfs.btrfs.8.in (+70/-0)
.pc/04-linker.patch/Makefile (+118/-0)
.pc/05-gzip.patch/man/Makefile (+37/-0)
.pc/06-armel.patch/cmds-scrub.c (+1721/-0)
.pc/07-allow-fsck-options.patch/btrfsck.c (+3547/-0)
.pc/applied-patches (+7/-0)
INSTALL (+23/-12)
Makefile (+51/-31)
bcp (+2/-4)
btrfs-corrupt-block.c (+396/-0)
btrfs-list.c (+147/-36)
btrfs-map-logical.c (+4/-5)
btrfs-select-super.c (+99/-0)
btrfs-show.c (+5/-0)
btrfs-vol.c (+24/-3)
btrfs-zero-log.c (+72/-0)
btrfs.c (+247/-358)
btrfs_cmds.c (+0/-924)
btrfs_cmds.h (+0/-34)
btrfsck.c (+840/-148)
btrfsctl.c (+20/-4)
btrfslabel.c (+121/-0)
btrfslabel.h (+5/-0)
calc-size.c (+268/-0)
cmds-balance.c (+713/-0)
cmds-device.c (+261/-0)
cmds-filesystem.c (+538/-0)
cmds-inspect.c (+243/-0)
cmds-scrub.c (+1721/-0)
cmds-subvolume.c (+533/-0)
commands.h (+97/-0)
common.c (+46/-0)
convert.c (+4/-64)
ctree.c (+153/-153)
ctree.h (+178/-14)
debian/README.source (+0/-37)
debian/btrfs-tools-udeb.install (+1/-1)
debian/btrfs-tools.README.Debian (+0/-7)
debian/btrfs-tools.install (+0/-2)
debian/btrfs-tools.links (+0/-1)
debian/changelog (+148/-35)
debian/compat (+1/-1)
debian/control (+6/-13)
debian/copyright (+16/-64)
debian/local/btrfs.hook (+2/-2)
debian/local/btrfs.local-premount (+2/-2)
debian/local/btrfs.modules (+0/-4)
debian/patches/01-labels.patch (+0/-27)
debian/patches/02-ftbfs.patch (+1/-105)
debian/patches/03-glibc.patch (+0/-14)
debian/patches/03-manpage.patch (+77/-0)
debian/patches/04-linker.patch (+15/-0)
debian/patches/04-werror.patch (+0/-20)
debian/patches/05-fix-ld.patch (+0/-16)
debian/patches/05-gzip.patch (+13/-0)
debian/patches/06-armel.patch (+15/-0)
debian/patches/07-allow-fsck-options.patch (+49/-0)
debian/patches/08-allow-fsck-options.patch (+0/-27)
debian/patches/09-unused-warnings.patch (+0/-481)
debian/patches/series (+5/-5)
debian/rules (+22/-10)
debian/source/format (+1/-1)
debian/source/options (+2/-0)
debug-tree.c (+125/-75)
dir-item.c (+1/-1)
disk-io.c (+211/-73)
disk-io.h (+6/-0)
extent-cache.c (+2/-4)
extent-tree.c (+223/-55)
extent_io.c (+10/-9)
file-item.c (+2/-1)
find-root.c (+458/-0)
help.c (+214/-0)
ioctl-test.c (+1/-0)
ioctl.h (+164/-2)
kerncompat.h (+4/-0)
man/Makefile (+0/-37)
man/btrfs-image.8.in (+0/-34)
man/btrfs-show.8.in (+0/-19)
man/btrfs.8.in (+196/-44)
man/btrfsck.8.in (+0/-17)
man/btrfsctl.8.in (+0/-45)
man/mkfs.btrfs.8.in (+0/-63)
mkfs.c (+998/-79)
print-tree.c (+16/-9)
repair.c (+50/-0)
repair.h (+32/-0)
restore.c (+872/-0)
utils.c (+435/-49)
utils.h (+8/-2)
volumes.c (+173/-28)
volumes.h (+52/-0)
Related bugs
Related blueprints
Branch information
- Owner:
- Dimitri John Ledkov
- Status:
- Development
Recent revisions
- 33. By Philip Muškovac
-
07-allow-
fsck-options. patch:
Instead of failing on fsck options, just print the version and exit - 31. By Philip Muškovac
-
* 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. - 26. By Loïc Minier
-
* 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.
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