From 19311896a75f2fe4125820f0aabf0ecd68620ef5 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Mon, 15 Jan 2024 11:59:16 +0100 Subject: [PATCH 1/3] Preserve network configuration provided via kernel boot line --- service/lib/agama/network.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/service/lib/agama/network.rb b/service/lib/agama/network.rb index 23eef44e37..944d684093 100644 --- a/service/lib/agama/network.rb +++ b/service/lib/agama/network.rb @@ -52,6 +52,7 @@ def install attr_reader :logger ETC_NM_DIR = "/etc/NetworkManager" + RUN_NM_DIR = "/run/NetworkManager" private_constant :ETC_NM_DIR def enable_service @@ -68,6 +69,13 @@ def enable_service def copy_files return unless Dir.exist?(ETC_NM_DIR) + # runtime configuration is copied first, so in case of later modification + # on same interface it gets overwriten. + copy_directory( + File.join(RUN_NM_DIR, "system-connections"), + File.join(Yast::Installation.destdir, ETC_NM_DIR, "system-connections") + ) + copy_directory( File.join(ETC_NM_DIR, "system-connections"), File.join(Yast::Installation.destdir, ETC_NM_DIR, "system-connections") From 3ff3f8df8244ebe2195efe6dabaeafda21b2dc0b Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Tue, 16 Jan 2024 11:51:11 +0100 Subject: [PATCH 2/3] Updated changelog --- service/package/rubygem-agama.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/service/package/rubygem-agama.changes b/service/package/rubygem-agama.changes index d2564ea3d1..15837bc65c 100644 --- a/service/package/rubygem-agama.changes +++ b/service/package/rubygem-agama.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 16 10:49:14 UTC 2024 - Michal Filka + +- bsc#1210541, gh#openSUSE/agama#516 + - copy NM's runtime config created on dracut's request to the target +------------------------------------------------------------------- Thu Jan 11 15:32:44 UTC 2024 - Imobach Gonzalez Sosa - Handle the encoding included in the UILocale D-Bus property From e296e37e197e44ba5a884e40abb4031eafa181c9 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Tue, 16 Jan 2024 12:05:05 +0100 Subject: [PATCH 3/3] Minor improvement --- service/lib/agama/network.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/lib/agama/network.rb b/service/lib/agama/network.rb index 944d684093..972ec5162f 100644 --- a/service/lib/agama/network.rb +++ b/service/lib/agama/network.rb @@ -70,7 +70,7 @@ def copy_files return unless Dir.exist?(ETC_NM_DIR) # runtime configuration is copied first, so in case of later modification - # on same interface it gets overwriten. + # on same interface it gets overwriten (bsc#1210541). copy_directory( File.join(RUN_NM_DIR, "system-connections"), File.join(Yast::Installation.destdir, ETC_NM_DIR, "system-connections")