mirrors/meta-secure-core
1
0
Fork 0
mirror of https://github.com/jiazhang0/meta-secure-core.git synced 2026-01-12 01:00:15 +00:00
Code Issues Projects Releases Wiki Activity

lvm2: Fix hanging dmcrypt volumes on boot

Browse Source 
The initrd takes care of starting the luks volumes and activing the
dmcrypt udev rules.  The udev rule required a modification to deal
with volumes that had already been started, else the cold plug event
that runs at user space startup puts the dmcrypt device into a state
that systemd cannot manage it.

[ Issue: LINUXEXEC-2450 ]

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
This commit is contained in:
Jason Wessel
2019-10-29 12:44:46 -07:00
committed by Jia Zhang
parent d63b6d273b
commit ca003d11bb
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
meta-encrypted-storage/recipes-support/lvm2/lvm2/0001-10-dm.rules.in-Fix-dmcrypt-hanging-on-hand-over-from.patch Normal file
View File

@@ -0,0 +1,38 @@
From b655a26908ca170bf030d7bb8de6d6a96022375b Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Mon, 28 Oct 2019 17:43:57 -0700
Subject: [PATCH] 10-dm.rules.in: Fix dmcrypt hanging on hand over from
initramfs
If an encrypted volume has already been setup from the intiramfs, it
should not have the device nodes removed. The udevadm trigger
--action=add for the device was causing the dm managed udev rules to
fall throug to the dm_disable path, which knocks the device offline
and it is not possible to reactivate it because the initramfs shuts
down the path to obtain the key from the TPM after the boot sequence
is completed.
Upstream-Status: Pending
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
---
udev/10-dm.rules.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in
index b4fa52a..ccaf863 100644
--- a/udev/10-dm.rules.in
+++ b/udev/10-dm.rules.in
@@ -84,7 +84,8 @@ LABEL="dm_flags_done"
# script to not remove the existing udev database so we can reuse the information
# stored at the time of device activation in the initrd.
ACTION!="add", GOTO="dm_no_coldplug"
-ENV{DM_UDEV_RULES_VSN}!="1", ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}!="1", GOTO="dm_disable"
+ENV{DM_UDEV_RULES_VSN}=="2",GOTO="dm_no_coldplug"
+#ENV{DM_UDEV_RULES_VSN}!="1", ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}!="1", GOTO="dm_disable"
ENV{DM_ACTIVATION}="1"
LABEL="dm_no_coldplug"
--
2.23.0

7
meta-encrypted-storage/recipes-support/lvm2/lvm2_%.bbappend Normal file
View File

@@ -0,0 +1,7 @@
#
# Copyright (C) 2019 Wind River Systems, Inc.
#
FILESEXTRAPATHS_prepend := "${THISDIR}/lvm2:"
SRC_URI += "file://0001-10-dm.rules.in-Fix-dmcrypt-hanging-on-hand-over-from.patch"