Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at 2022-09-08 14:21:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Thu Sep 8 14:21:15 2022 rev:485 rq:1001500 version:4.5.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes
2022-08-23 14:26:27.347200908 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-network.new.2083/yast2-network.changes
2022-09-08 14:21:31.166368614 +0200
@@ -1,0 +2,8 @@
+Thu Sep 1 08:30:47 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- At the end of the installation, force an enablement of the
+ selected network service even when the selected one has not been
+ modified and ensure other backends are disabled (bsc#1202479)
+- 4.5.6
+
+-------------------------------------------------------------------
Old:
----
yast2-network-4.5.5.tar.bz2
New:
----
yast2-network-4.5.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.HbaQm0/_old 2022-09-08 14:21:31.754370197 +0200
+++ /var/tmp/diff_new_pack.HbaQm0/_new 2022-09-08 14:21:31.758370208 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.5.5
+Version: 4.5.6
Release: 0
Summary: YaST2 - Network Configuration
License: GPL-2.0-only
@@ -33,8 +33,8 @@
#for install task
BuildRequires: yast2-storage-ng
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
-# Replace PackageSystem with Package
-BuildRequires: yast2 >= 4.4.38
+# Added force option to NetworkService.EnableDisableNow method
+BuildRequires: yast2 >= 4.5.12
BuildRequires: yast2-packager >= 4.0.18
# Product control need xml agent
@@ -51,8 +51,8 @@
Requires: sysconfig >= 0.80.0
Requires: yast2-proxy
Requires: yast2-storage-ng
-# Replace PackageSystem with Package
-Requires: yast2 >= 4.4.38
+# Added force option to NetworkService.EnableDisableNow method
+Requires: yast2 >= 4.5.12
# Packages::vnc_packages
Requires: augeas-lenses
Requires: yast2-packager >= 4.0.18
++++++ yast2-network-4.5.5.tar.bz2 -> yast2-network-4.5.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.5.5/package/yast2-network.changes
new/yast2-network-4.5.6/package/yast2-network.changes
--- old/yast2-network-4.5.5/package/yast2-network.changes 2022-08-02
12:27:26.000000000 +0200
+++ new/yast2-network-4.5.6/package/yast2-network.changes 2022-09-06
18:51:27.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Sep 1 08:30:47 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- At the end of the installation, force an enablement of the
+ selected network service even when the selected one has not been
+ modified and ensure other backends are disabled (bsc#1202479)
+- 4.5.6
+
+-------------------------------------------------------------------
Thu Jul 21 08:38:40 UTC 2022 - Knut Anderssen <kanders...@suse.com>
- Added a class to generate the configuration needed for a FCoE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.5.5/package/yast2-network.spec
new/yast2-network-4.5.6/package/yast2-network.spec
--- old/yast2-network-4.5.5/package/yast2-network.spec 2022-08-02
12:27:26.000000000 +0200
+++ new/yast2-network-4.5.6/package/yast2-network.spec 2022-09-06
18:51:27.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.5.5
+Version: 4.5.6
Release: 0
Summary: YaST2 - Network Configuration
License: GPL-2.0-only
@@ -33,8 +33,8 @@
#for install task
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
BuildRequires: yast2-storage-ng
-# Replace PackageSystem with Package
-BuildRequires: yast2 >= 4.4.38
+# Added force option to NetworkService.EnableDisableNow method
+BuildRequires: yast2 >= 4.5.12
BuildRequires: yast2-packager >= 4.0.18
# Product control need xml agent
@@ -51,8 +51,8 @@
Requires: sysconfig >= 0.80.0
Requires: yast2-proxy
Requires: yast2-storage-ng
-# Replace PackageSystem with Package
-Requires: yast2 >= 4.4.38
+# Added force option to NetworkService.EnableDisableNow method
+Requires: yast2 >= 4.5.12
# Packages::vnc_packages
Requires: yast2-packager >= 4.0.18
Requires: augeas-lenses
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.5.5/src/lib/network/clients/save_network.rb
new/yast2-network-4.5.6/src/lib/network/clients/save_network.rb
--- old/yast2-network-4.5.5/src/lib/network/clients/save_network.rb
2022-08-02 12:27:26.000000000 +0200
+++ new/yast2-network-4.5.6/src/lib/network/clients/save_network.rb
2022-09-06 18:51:27.000000000 +0200
@@ -355,6 +355,10 @@
# at all specially in a live installation where NM is the backend by
# default. For detecting changes we should reset the cache first.
NetworkService.reset!
+ # Ensure not selected backend is disabled in order to not end with two
network backends
+ # running at the same time. (bsc#1202479)
+ NetworkService.send(:disable_service, :wicked)
+ NetworkService.send(:disable_service, :network_manager)
case backend
when :network_manager
log.info("- using NetworkManager")
@@ -363,12 +367,12 @@
log.info("- using wicked")
NetworkService.use_wicked
when :none
- NetworkService.send(:disable_service, :wicked)
- NetworkService.send(:disable_service, :network_manager)
return
end
- NetworkService.EnableDisableNow
+ # Force the enablement of the selected backend just in case no
modifications was detected but
+ # the backend was not enabled at all. (bsc#1202479)
+ NetworkService.EnableDisableNow(force: true)
end
# this replaces bash script create_interface
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.5.5/test/save_network_test.rb
new/yast2-network-4.5.6/test/save_network_test.rb
--- old/yast2-network-4.5.5/test/save_network_test.rb 2022-08-02
12:27:26.000000000 +0200
+++ new/yast2-network-4.5.6/test/save_network_test.rb 2022-09-06
18:51:27.000000000 +0200
@@ -67,6 +67,7 @@
allow(Yast::Lan).to receive(:Write)
allow(Yast::Arch).to receive(:s390).and_return(s390)
allow(Yast::NetworkService).to receive(:EnableDisableNow)
+ allow(Yast::NetworkService).to receive(:disable_service)
allow(Yast::NetworkAutoYast.instance).to
receive(:configure_hosts).and_return(nil)
end
@@ -198,6 +199,12 @@
subject.main
end
+ it "disables wicked" do
+ expect(Yast::NetworkService).to receive(:disable_service).with(:wicked)
+
+ subject.main
+ end
+
context "when running on network manager (e.g., live installation)" do
let(:system_backend) { Y2Network::Backends::NetworkManager.new }
@@ -224,6 +231,12 @@
context "when the backend selected is wicked" do
let(:selected_backend) { :wicked }
+ it "disables NetworkManager" do
+ expect(Yast::NetworkService).to
receive(:disable_service).with(:network_manager)
+
+ subject.main
+ end
+
it "selects wicked as the service to be used after installation" do
expect(Yast::NetworkService).to receive(:use_wicked)
subject.main
