Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds the AY needed packages for the selected network backend (master) #854

Merged
merged 4 commits into from Oct 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions package/autoyast2.changes
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Oct 4 09:34:18 UTC 2022 - Knut Anderssen <kanderssen@suse.com>

- Add needed packages for the selected network backend in order to
prevent it is not declared in the software section (bsc#1201235,
bsc#1201435)
- 4.5.5

-------------------------------------------------------------------
Fri Sep 9 08:29:55 UTC 2022 - Michal Filka <mfilka@suse.com>

Expand Down
6 changes: 3 additions & 3 deletions package/autoyast2.spec
Expand Up @@ -22,7 +22,7 @@
%endif

Name: autoyast2
Version: 4.5.4
Version: 4.5.5
Release: 0
Summary: YaST2 - Automated Installation
License: GPL-2.0-only
Expand Down Expand Up @@ -73,8 +73,8 @@ Requires: yast2-core
Requires: yast2-country >= 3.1.13
# Moving security module to first installation stage
Requires: yast2-security >= 4.1.1
# Modify start_immediately default value
Requires: yast2-network >= 4.3.59
# Install selected network backend packages
Requires: yast2-network >= 4.5.9
Requires: yast2-schema >= 4.0.6
Requires: yast2-transfer >= 2.21.0
Requires: yast2-xml
Expand Down
4 changes: 2 additions & 2 deletions src/lib/autoinstall/clients/inst_autosetup.rb
Expand Up @@ -123,13 +123,13 @@ def main

# configure general settings
general_section = Profile.current.fetch_as_hash("general")
networking_section = Profile.current.fetch_as_hash("networking")
pkg_list = networking_section["managed"] ? ["NetworkManager"] : []
AutoinstGeneral.Import(general_section)
log.info("general: #{general_section}")
AutoinstGeneral.Write

autosetup_network
# Add needed network packages depending on the selected backend (bsc#1201435)
pkg_list = (Call.Function("lan_auto", ["Packages"]) || {}).fetch("install", [])

if Builtins.haskey(Profile.current, "add-on")
Progress.Title(_("Handling Add-On Products..."))
Expand Down
2 changes: 2 additions & 0 deletions test/lib/clients/inst_autosetup_test.rb
Expand Up @@ -47,6 +47,8 @@
allow(Yast::AutoinstStorage).to receive(:Write).and_return(true)

allow(Yast::WFM).to receive(:CallFunction).with(/_auto/, Array).and_return(true)
allow(Yast::WFM).to receive(:CallFunction)
.with("lan_auto", ["Packages"]).and_return("install" => [])
allow(Yast::WFM).to receive(:ClientExists).with(/_auto/).and_return(true)
allow(Yast::Popup).to receive(:ConfirmAbort).and_return(true)

Expand Down