Merge pull request #1132 from yast/alias_netmask

Fixed conversion of netmask dot-decimal notation to /prefixlength
yast · Dec 15, 2020 · 1ba981c · 1ba981c
2 parents 75e47e7 + b414ec0
commit 1ba981c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 15 08:38:07 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Fix prefix length assignation when the alias netmask uses
+  dot notation (bsc#1174766).
+- 4.2.88
+
 -------------------------------------------------------------------
 Thu Dec 10 10:43:48 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
 

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

diff --git a/src/lib/y2network/widgets/additional_addresses.rb b/src/lib/y2network/widgets/additional_addresses.rb
@@ -244,11 +244,10 @@ def dialog(name, entry)
           end
 
           res[:prefixlen] = if prefixlen.empty?
-            IPAddr.new("#{netmask}/#{netmask}")
+            IPAddr.new("#{netmask}/#{netmask}").prefix
           else
             prefixlen
           end
-          res[:prefixlen] = prefixlen
           res[:id] = id
 
           break