Merge pull request #23 from yast/SLE-12-SP3_bnc_1047232

added StartDaemon flag
yast · Jul 10, 2017 · 7007546 · 7007546
2 parents 6a75fca + a576ce4
commit 7007546
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/package/yast2-ftp-server.changes b/package/yast2-ftp-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 10 14:20:16 CEST 2017 - schubi@suse.de
+
+- Added missing StartDaemon flag to internal data structure in
+  order to read it from the AY configuration file. (bnc#1047232)
+- 3.2.2
+
 -------------------------------------------------------------------
 Wed Jan  4 17:00:41 UTC 2017 - mvidner@suse.com
 

diff --git a/package/yast2-ftp-server.spec b/package/yast2-ftp-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ftp-server
-Version:        3.2.1
+Version:        3.2.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/FtpServer.rb b/src/modules/FtpServer.rb
@@ -958,7 +958,11 @@ def Import(settings)
       InitDaemon()
 
       result = true
-      Builtins.foreach(@UI_keys) do |key|
+
+      # StartDaemon setting is not a part of the general UI but is needed
+      # for the AutoYaST installation and is set in the AY configuration
+      # file. So we have to add it here too. (bnc#1047232)
+      Builtins.foreach(@UI_keys + ["StartDaemon"]) do |key|
         val = Ops.get_string(settings, key)
         Ops.set(@EDIT_SETTINGS, key, val) if val != nil
         if val == nil