From a5d1632d7fb4d141acb067644154f1136100a06b Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 1 Jan 2022 15:05:28 +0200 Subject: fix condition for crypttab Sponsored-by: author --- vmdb/plugins/cryptsetup_plugin.py | 1 + vmdb/plugins/fstab_plugin.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/vmdb/plugins/cryptsetup_plugin.py b/vmdb/plugins/cryptsetup_plugin.py index 985bc42..c69b9c8 100644 --- a/vmdb/plugins/cryptsetup_plugin.py +++ b/vmdb/plugins/cryptsetup_plugin.py @@ -53,6 +53,7 @@ class CryptsetupStepRunner(vmdb.StepRunnerInterface): uuid = vmdb.runcmd(["cryptsetup", "luksUUID", device]).decode("UTF8").strip() state.tags.append(name) + state.tags.set_dev(name, crypt_device) state.tags.set_uuid(name, uuid) state.tags.set_dm(name, name) vmdb.progress("remembering LUKS device {} as {}".format(crypt_device, name)) diff --git a/vmdb/plugins/fstab_plugin.py b/vmdb/plugins/fstab_plugin.py index 7f8ef15..04c2312 100644 --- a/vmdb/plugins/fstab_plugin.py +++ b/vmdb/plugins/fstab_plugin.py @@ -66,5 +66,5 @@ class FstabStepRunner(vmdb.StepRunnerInterface): line = "{name} UUID={uuid} none luks,discard\n" with open(crypttab_path, "w") as crypttab: for entry in filesystems: - if "uuid" in entry and "name" in entry and "device" not in entry: + if "uuid" in entry and "name" in entry: crypttab.write(line.format(**entry)) -- cgit v1.2.1