d9029cec24
- Improve set_systemd_services_states logging - [IPU 7 -> 8] Fix detection of bootable device on RAID - Fix detection of valid sshd config with internal-sftp subsystem in Leapp - Handle a false positive GPG check error when TargetUserSpaceInfo is missing - Fix failing "update-ca-trust" command caused by missing util-linux package - Improve report when a system is unsupported - Fix handling of versions in RHUI configuration for ELS and SAP upgrades - Add missing RHUI GCP config info for RHEL for SAP - Resolves: RHEL-33902, RHEL-30573, RHEL-43978, RHEL-39046, RHEL-39047, RHEL-39049
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
From 5feeba7b216ec34f9a201f034d2c8f8db1462e6a Mon Sep 17 00:00:00 2001
|
|
From: Evgeni Golov <evgeni@golov.de>
|
|
Date: Fri, 26 Apr 2024 09:33:48 +0200
|
|
Subject: [PATCH 68/92] Don't enable services that will be afterwards disabled
|
|
|
|
---
|
|
.../libraries/setsystemdservicesstate.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/systemd/setsystemdservicesstates/libraries/setsystemdservicesstate.py b/repos/system_upgrade/common/actors/systemd/setsystemdservicesstates/libraries/setsystemdservicesstate.py
|
|
index 3f84f59f..8aeb5c2c 100644
|
|
--- a/repos/system_upgrade/common/actors/systemd/setsystemdservicesstates/libraries/setsystemdservicesstate.py
|
|
+++ b/repos/system_upgrade/common/actors/systemd/setsystemdservicesstates/libraries/setsystemdservicesstate.py
|
|
@@ -15,7 +15,7 @@ def process():
|
|
msg = 'Attempted to both enable and disable systemd service "{}", service will be disabled.'.format(service)
|
|
api.current_logger().warning(msg)
|
|
|
|
- for service in services_to_enable:
|
|
+ for service in services_to_enable - intersection:
|
|
try:
|
|
systemd.enable_unit(service)
|
|
except CalledProcessError:
|
|
--
|
|
2.42.0
|
|
|