ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/hjmallon/util-linux 

* 'master' of https://github.com/hjmallon/util-linux:
  libblkid: Add very basic APFS recognition
This commit is contained in:
Karel Zak 2018-07-04 13:25:07 +02:00
parent 805400c730 084f092a62
commit 3918998043
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libblkid/src/Makemodule.am
View File

@ -44,6 +44,7 @@ libblkid_la_SOURCES = \
libblkid/src/partitions/unixware.c \
\
libblkid/src/superblocks/adaptec_raid.c \
libblkid/src/superblocks/apfs.c \
libblkid/src/superblocks/bcache.c \
libblkid/src/superblocks/befs.c \
libblkid/src/superblocks/bfs.c \

19
libblkid/src/superblocks/apfs.c Normal file
View File

@ -0,0 +1,19 @@
/*
* Copyright (C) 2018 Harry Mallon <hjmallon@gmail.com>
*
* This file may be redistributed under the terms of the
* GNU Lesser General Public License.
*/
#include "superblocks.h"
const struct blkid_idinfo apfs_idinfo =
{
.name = "apfs",
.usage = BLKID_USAGE_FILESYSTEM,
.magics =
{
{ .magic = "NXSB", .len = 4, .sboff = 32 },
{ NULL }
}
};

3
libblkid/src/superblocks/superblocks.c
View File

@ -163,7 +163,8 @@ static const struct blkid_idinfo *idinfos[] =
&nilfs2_idinfo,
&exfat_idinfo,
&f2fs_idinfo,
&mpool_idinfo
&mpool_idinfo,
&apfs_idinfo
};
/*

1
libblkid/src/superblocks/superblocks.h
View File

@ -82,6 +82,7 @@ extern const struct blkid_idinfo mpool_idinfo;
extern const struct blkid_idinfo vdo_idinfo;
extern const struct blkid_idinfo stratis_idinfo;
extern const struct blkid_idinfo bitlocker_idinfo;
extern const struct blkid_idinfo apfs_idinfo;
/*
* superblock functions