Merge remote-tracking branch 'upstream/SLE-12-GA' into firewall_propo…

…sal_1st_stage_also_in_master Conflicts: package/yast2-network.changes package/yast2-network.spec
yast · May 18, 2015 · 7474273 · 7474273
2 parents 5595e2e + b78fead
commit 7474273
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,5 +1,13 @@
 -------------------------------------------------------------------
-Mon Apr 27 07:06:18 UTC 2015 - mfilka@suse.com
+Mon May 18 12:59:27 CEST 2015 - locilka@suse.com
+
+- bsc#916376
+  - proposing iSCSI-related configuration in firewall proposal
+    in first stage if iSCSI is in use
+- 3.1.115
+
+-------------------------------------------------------------------
+Fri Mar  6 13:48:24 UTC 2015 - mfilka@suse.com
 
 - bnc#912904 
   - do not crash when adding new device and proposed configuration

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -35,8 +35,8 @@ BuildRequires:  yast2-proxy
 
 # yast2 v3.1.86: Added ServicesProposal library
 BuildRequires:  yast2 >= 3.1.86
-# yast2 v3.1.97: Fixed checking whether SuSEfirewall2 package is installed/selected
-Requires:       yast2 >= 3.1.97
+# yast2 v3.1.123: Added new API SuSEFirewallProposal.propose_iscsi
+Requires:       yast2 >= 3.1.123
 
 #netconfig (FaTE #303618)
 Requires:       sysconfig >= 0.80.0

diff --git a/src/clients/firewall_stage1_proposal.rb b/src/clients/firewall_stage1_proposal.rb
@@ -431,6 +431,10 @@ def adjust_configuration
         log.warn "Services #{SuSEFirewall4NetworkClass::VNC_SERVICES} are unknown"
       end
 
+      # BNC #766300 - Automatically propose opening iscsi-target port
+      # when installing with withiscsi=1
+      SuSEFirewallProposal.propose_iscsi if Linuxrc.useiscsi
+
       # Writing the configuration including adjusting services
       # is done in firewall_stage1_finish
     end