Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
Also add patch to fix blkid header location as suggested in #17877 Signed-off-by: Daniel Golle <daniel@makrotopia.org>