forked from rpms/leapp-repository
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From 1ba6d4301602c8a253ba92263fd829e385463182 Mon Sep 17 00:00:00 2001
|
|
From: Petr Stodulka <pstodulk@redhat.com>
|
|
Date: Fri, 17 Oct 2025 15:19:03 +0200
|
|
Subject: [PATCH 26/55] livemode: update obsoleted log msg about config
|
|
|
|
The original livemode configuration was located in
|
|
/etc/leapp/files/leapp-livemode.ini
|
|
|
|
However, this file has been replaced by new configuration for actors,
|
|
represented by variable filename under /etc/leapp/actor_conf.d/
|
|
|
|
I decided to keep the info log, but dropped the information about the
|
|
file path.
|
|
---
|
|
.../livemode_config_scanner/libraries/scan_livemode_config.py | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/livemode/livemode_config_scanner/libraries/scan_livemode_config.py b/repos/system_upgrade/common/actors/livemode/livemode_config_scanner/libraries/scan_livemode_config.py
|
|
index 26fd9d09..7d72204c 100644
|
|
--- a/repos/system_upgrade/common/actors/livemode/livemode_config_scanner/libraries/scan_livemode_config.py
|
|
+++ b/repos/system_upgrade/common/actors/livemode/livemode_config_scanner/libraries/scan_livemode_config.py
|
|
@@ -5,7 +5,6 @@ from leapp.libraries.common.rpms import has_package
|
|
from leapp.libraries.stdlib import api
|
|
from leapp.models import InstalledRPM, LiveModeConfig
|
|
|
|
-LIVEMODE_CONFIG_LOCATION = '/etc/leapp/files/devel-livemode.ini'
|
|
DEFAULT_SQUASHFS_PATH = '/var/lib/leapp/live-upgrade.img'
|
|
|
|
|
|
@@ -39,8 +38,7 @@ def scan_config_and_emit_message():
|
|
if not should_scan_config():
|
|
return
|
|
|
|
- api.current_logger().info('Loading livemode config from %s', LIVEMODE_CONFIG_LOCATION)
|
|
-
|
|
+ api.current_logger().info('Loading the livemode configuration.')
|
|
config = api.current_actor().config[livemode_config_lib.LIVEMODE_CONFIG_SECTION]
|
|
|
|
# Mapping from model field names to configuration fields - because we might have
|
|
--
|
|
2.51.1
|
|
|