Merge 1a01d9e into 5a72777

yast · Mar 23, 2021 · 22c5551 · 22c5551
2 parents 5a72777 + 1a01d9e
commit 22c5551
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 17 18:26:34 UTC 2021 - Knut Anderssen <kanderssen@suse.com>
+
+- Always provide the layer2 argument when activating a qeth device
+  (bsc#1183639).
+- 4.2.97
+
 -------------------------------------------------------------------
 Thu Mar  4 15:41:04 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.2.96
+Version:        4.2.97
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/lib/y2network/s390_device_activators/qeth.rb b/src/lib/y2network/s390_device_activators/qeth.rb
@@ -49,8 +49,10 @@ def configure_attributes
         extra_attributes.concat(attributes.split(" ")) if attributes
         # Only set if enable
         extra_attributes << ipa_takeover_attribute if ipa_takeover
-        # Only set if enable
-        extra_attributes << layer2_attribute if layer2
+        # By default the activation command uses layer2 autodetection but as
+        # this option is not exposed in the activation dialog we have to add it
+        # always (bsc#1183639)
+        extra_attributes << layer2_attribute
         extra_attributes << port_attribute if port_number.to_s != "0"
         extra_attributes
       end

diff --git a/test/y2network/s390_device_activators/qeth_test.rb b/test/y2network/s390_device_activators/qeth_test.rb
@@ -49,14 +49,14 @@
   describe "#configure" do
     it "tries to activate the group device associated with the defined device id" do
       expect(Yast::Execute).to receive(:on_target!)
-        .with("/sbin/chzdev", "qeth", subject.device_id, "-e",
+        .with("/sbin/chzdev", "qeth", subject.device_id, "-e", "layer2=0",
           stdout: :capture, stderr: :capture, allowed_exitstatus: 0..255)
       subject.configure
     end
 
     it "returns an array with the stdout, stderr, and command status" do
       expect(Yast::Execute).to receive(:on_target!)
-        .with("/sbin/chzdev", "qeth", subject.device_id, "-e",
+        .with("/sbin/chzdev", "qeth", subject.device_id, "-e", "layer2=0",
           stdout: :capture, stderr: :capture, allowed_exitstatus: 0..255)
         .and_return(chzdev_output)