From dcce98a4bdc302a5efeb3a5c35b6cbf6d16a3efc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 2 Mar 2017 19:11:37 +0100 Subject: Avoid strict DM interface version dependencies (#5519) Compiling against the dm-ioctl.h header as provided by the Linux kernel will embed the DM interface version number. Running an older kernel can result in an error like this on shutdown: Could not detach DM dm-11: ioctl mismatch, kernel(4.34.4), user(4.35.4) Work around this by shipping a local copy of dm-ioctl.h. We need at least the version from 3.13 for DM_DEFERRED_REMOVE [1], so bump the requirements in README accordingly. [1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2c140a246dc0bc085b98eddde978060fcec1080c Fixes: #5492 --- src/shared/dissect-image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/shared/dissect-image.c') diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 39e724c51a..1c9d21566f 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -20,7 +20,6 @@ #ifdef HAVE_LIBCRYPTSETUP #include #endif -#include #include #include "architecture.h" @@ -32,6 +31,7 @@ #include "fs-util.h" #include "gpt.h" #include "hexdecoct.h" +#include "linux-3.13/dm-ioctl.h" #include "mount-util.h" #include "path-util.h" #include "stat-util.h" -- cgit v1.2.3-54-g00ecf