[PATCH][kinetic/linux-kvm] UBUNTU: [Config] CONFIG_DM_VERITY=m

[Tim Gardner]

BugLink: https://bugs.launchpad.net/bugs/2019040

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.kvm/config/annotations          | 6 ++++++
 debian.kvm/config/config.common.ubuntu | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian.kvm/config/annotations b/debian.kvm/config/annotations
index 8518e947569d..f1716d95880d 100644
--- a/debian.kvm/config/annotations
+++ b/debian.kvm/config/annotations
@@ -2,6 +2,12 @@
 # FORMAT: 3
 # ARCH: x86
 
+CONFIG_DM_VERITY                policy<{'amd64': 'm'}>
+CONFIG_DM_VERITY_FEC            policy<{'amd64': 'n'}>
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG policy<{'amd64': 'y'}>
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING policy<{'amd64': 'y'}>
+CONFIG_DM_VERITY                note<LP: #2019040>
+
 CONFIG_DUMMY                    policy<{'amd64': 'm'}>
 CONFIG_DUMMY                    mark<ENFORCED> note<LP: #1998244>
 
diff --git a/debian.kvm/config/config.common.ubuntu b/debian.kvm/config/config.common.ubuntu
index 2b89914a7518..3cf18a9c6508 100644
--- a/debian.kvm/config/config.common.ubuntu
+++ b/debian.kvm/config/config.common.ubuntu
@@ -765,7 +765,10 @@ CONFIG_DM_PERSISTENT_DATA=m
 # CONFIG_DM_THIN_PROVISIONING is not set
 # CONFIG_DM_UEVENT is not set
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY is not set
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y
 # CONFIG_DM_WRITECACHE is not set
 # CONFIG_DM_ZERO is not set
 # CONFIG_DNOTIFY is not set
-- 
2.34.1