Merge pull request #753 from yast/merge_SLE-12-SP4

Merge SLE-12-SP4 into SLE-15-GA
yast · Jul 3, 2018 · 754a121 · 754a121
2 parents 116b134 + eb9595a
commit 754a121
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/library/network/src/lib/network/susefirewall2.rb b/library/network/src/lib/network/susefirewall2.rb
@@ -1627,7 +1627,7 @@ def ActivateConfiguration
       # starting firewall during second stage can cause deadlock in systemd - bnc#798620
       # Moreover, it is not needed. Firewall gets started via dependency on multi-user.target
       # when second stage is over.
-      if Mode.installation
+      if Mode.installation && !Mode.autoinst
         Builtins.y2milestone("Do not touch firewall services during installation")
 
         return true

diff --git a/library/network/src/modules/NetworkInterfaces.rb b/library/network/src/modules/NetworkInterfaces.rb
@@ -848,8 +848,8 @@ def Write(devregex)
           # look in OriginalDevs because we need to catch all variables
           # of the alias
 
-          dev_aliases = original_devs[typ][dev]["_aliases"][anum] || {}
-          dev_aliases.keys.each do |key|
+          dev_aliases = original_devs.fetch(typ, {}).fetch(dev, {}).fetch("_aliases", {})
+          dev_aliases.fetch(anum, {}).keys.each do |key|
             p = base + "#{key}_#{anum}"
             log.debug("deleting: #{p}")
             SCR.Write(p, nil)

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  3 08:01:07 UTC 2018 - knut.anderssen@suse.com
+
+- Network: Prevent from crashing when trying to delete some ip
+  aliases from the original devices (bsc#1098919)
+- 4.0.79
+
 -------------------------------------------------------------------
 Wed Jun 27 15:42:04 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.0.78
+Version:        4.0.79
 Release:        0
 Summary:        YaST2 - Main Package
 License:        GPL-2.0-only