Merge branch 'SLE-15-GA' into merge_SLE-15-GA

yast · Sep 12, 2018 · f145a60 · f145a60
2 parents 9777395 + 29abd14
commit f145a60
Show file tree

Hide file tree

Showing 5 changed files with 911 additions and 2 deletions.
diff --git a/library/network/src/lib/network/susefirewalld.rb b/library/network/src/lib/network/susefirewalld.rb
@@ -1017,6 +1017,12 @@ def SetAcceptExpertRules(zone, expert_rules)
       true
     end
 
+    # FIXME: this method currently does nothing at all and has been added just
+    # for having the same API than SuSEFirewall2 but it is deprecated
+    def full_init_on_boot(new_state)
+      new_state
+    end
+
   private
 
     def set_zone_modified(zone, zone_params)
@@ -1338,5 +1344,6 @@ def set_ports_with_protocol_to_zone(ports, protocol, zone)
     publish function: :AddService, type: "boolean (string, string, string)"
     publish function: :RemoveService, type: "boolean (string, string, string)"
     publish function: :AddXenSupport, type: "void ()"
+    publish function: :full_init_on_boot, type: "boolean (boolean)"
   end
 end