57 lines
3.0 KiB
Diff
57 lines
3.0 KiB
Diff
|
From f84c6f808a821d3ccd09a4a8278cef9c09984a28 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Zatovic <daniel.zatovic@gmail.com>
|
||
|
|
Date: Wed, 3 Apr 2024 23:25:06 +0200
|
||
|
|
Subject: [PATCH 17/40] InhibitWhenLuks: simplify the logic
|
||
|
|
|
||
|
|
---
|
||
|
|
.../common/actors/inhibitwhenluks/actor.py | 35 +++++++------------
|
||
|
|
1 file changed, 13 insertions(+), 22 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/repos/system_upgrade/common/actors/inhibitwhenluks/actor.py b/repos/system_upgrade/common/actors/inhibitwhenluks/actor.py
|
||
|
|
index d3ff2d2e..40b845b0 100644
|
||
|
|
--- a/repos/system_upgrade/common/actors/inhibitwhenluks/actor.py
|
||
|
|
+++ b/repos/system_upgrade/common/actors/inhibitwhenluks/actor.py
|
||
|
|
@@ -24,26 +24,17 @@ class InhibitWhenLuks(Actor):
|
||
|
|
ceph_info = next(self.consume(CephInfo))
|
||
|
|
if ceph_info:
|
||
|
|
ceph_vol = ceph_info.encrypted_volumes[:]
|
||
|
|
- for storage_info in self.consume(StorageInfo):
|
||
|
|
- for blk in storage_info.lsblk:
|
||
|
|
- if blk.tp == 'crypt' and blk.name not in ceph_vol:
|
||
|
|
- create_report([
|
||
|
|
- reporting.Title('LUKS encrypted partition detected'),
|
||
|
|
- reporting.Summary('Upgrading system with encrypted partitions is not supported'),
|
||
|
|
- reporting.Severity(reporting.Severity.HIGH),
|
||
|
|
- reporting.Groups([reporting.Groups.BOOT, reporting.Groups.ENCRYPTION]),
|
||
|
|
- reporting.Groups([reporting.Groups.INHIBITOR]),
|
||
|
|
- ])
|
||
|
|
- break
|
||
|
|
except StopIteration:
|
||
|
|
- for storage_info in self.consume(StorageInfo):
|
||
|
|
- for blk in storage_info.lsblk:
|
||
|
|
- if blk.tp == 'crypt':
|
||
|
|
- create_report([
|
||
|
|
- reporting.Title('LUKS encrypted partition detected'),
|
||
|
|
- reporting.Summary('Upgrading system with encrypted partitions is not supported'),
|
||
|
|
- reporting.Severity(reporting.Severity.HIGH),
|
||
|
|
- reporting.Groups([reporting.Groups.BOOT, reporting.Groups.ENCRYPTION]),
|
||
|
|
- reporting.Groups([reporting.Groups.INHIBITOR]),
|
||
|
|
- ])
|
||
|
|
- break
|
||
|
|
+ pass
|
||
|
|
+
|
||
|
|
+ for storage_info in self.consume(StorageInfo):
|
||
|
|
+ for blk in storage_info.lsblk:
|
||
|
|
+ if blk.tp == 'crypt' and blk.name not in ceph_vol:
|
||
|
|
+ create_report([
|
||
|
|
+ reporting.Title('LUKS encrypted partition detected'),
|
||
|
|
+ reporting.Summary('Upgrading system with encrypted partitions is not supported'),
|
||
|
|
+ reporting.Severity(reporting.Severity.HIGH),
|
||
|
|
+ reporting.Groups([reporting.Groups.BOOT, reporting.Groups.ENCRYPTION]),
|
||
|
|
+ reporting.Groups([reporting.Groups.INHIBITOR]),
|
||
|
|
+ ])
|
||
|
|
+ break
|
||
|
|
--
|
||
|
|
2.47.0
|
||
|
|
|