improve btrfs magic: https://bugs.debian.org/663454

diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index d8a802a31ee472e14de1375d8b9441af38024caf..65d99bcf4c8bc99d13a821e4fdcda6472fcc2ae5 100644 (file)
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: filesystems,v 1.109 2015/02/22 01:22:54 christos Exp $
+# $File: filesystems,v 1.110 2015/08/24 05:11:10 christos Exp $
 # filesystems:  file(1) magic for different filesystems
 #
 0      name    partid  
@@ -2209,13 +2209,21 @@
 >>0x10024        belong          x               (blocksize %d,
 >>0x10060        string          >\0             lockproto %s)
 
-# BTRFS
-0x10040         string          _BHRfS_M        BTRFS Filesystem
->0x1012b        string          >\0             (label "%s",
->0x10090        lelong          x               sectorsize %d,
->0x10094        lelong          x               nodesize %d,
->0x10098        lelong          x               leafsize %d)
-
+# Russell Coker <russell@coker.com.au>
+0x10040                string  _BHRfS_M        BTRFS Filesystem
+>0x1012b       string  >\0             label "%s",
+>0x10090       lelong  x               sectorsize %d,
+>0x10094       lelong  x               nodesize %d,
+>0x10098       lelong  x               leafsize %d,
+>0x10020       belong  x               UUID=%8x-
+>0x10024       beshort x               \b%4x-
+>0x10026       beshort x               \b%4x-
+>0x10028       beshort x               \b%4x-
+>0x1002a       beshort x               \b%4x
+>0x1002c       belong  x               \b%8x,
+>0x10078       lequad  x               %lld/
+>0x10070       lequad  x               \b%lld bytes used,
+>0x10088       lequad  x               %lld devices
 
 # dvdisaster's .ecc
 # From: "Nelson A. de Oliveira" <naoliv@gmail.com>