[yast-commit] [ci_new_pac] JFYI yast2-kdump -> sle12

19 Mar 2014

Script 'mail_helper' called by ro
Hello packager,

This is just FYI.  Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-kdump -> sle12




Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-kdump/yast2-kdump.changes	2014-03-14 11:51:17.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-kdump/yast2-kdump.changes	2014-03-19 10:12:35.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 18 15:54:20 UTC 2014 - mvidner@suse.com
+
+- actually write the sysconfig data for kdumptool calibrate (FATE#315241)
+- 3.1.8
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-kdump
- yast2-schema
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-kdump (Old)
 and      /mounts/work_src_done/SLE12/yast2-kdump (BS:build ID:34585 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-kdump", Maintainer is "yast-commit@opensuse.org"


Old:
----
  yast2-kdump-3.1.7.tar.bz2

New:
----
  yast2-kdump-3.1.8.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-kdump.spec ++++++
--- /var/tmp/diff_new_pack.dh2qtG/_old	2014-03-19 12:10:16.000000000 +0100
+++ /var/tmp/diff_new_pack.dh2qtG/_new	2014-03-19 12:10:16.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        3.1.7
+Version:        3.1.8
 Release:        0
 
 Url:            https://github.com/yast/yast-kdump

++++++ yast2-kdump-3.1.7.tar.bz2 -> yast2-kdump-3.1.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.7/package/yast2-kdump.changes new/yast2-kdump-3.1.8/package/yast2-kdump.changes
--- old/yast2-kdump-3.1.7/package/yast2-kdump.changes	2014-03-13 13:09:34.000000000 +0100
+++ new/yast2-kdump-3.1.8/package/yast2-kdump.changes	2014-03-19 10:54:00.000000000 +0100
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Mar 18 15:54:20 UTC 2014 - mvidner@suse.com
+
+- actually write the sysconfig data for kdumptool calibrate (FATE#315241)
+- 3.1.8
+
+-------------------------------------------------------------------
 Thu Mar 13 09:41:09 UTC 2014 - vmoravec@suse.com
 
 - Fix wrong systemd unit name in Kdump module (bnc#867714)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.7/package/yast2-kdump.spec new/yast2-kdump-3.1.8/package/yast2-kdump.spec
--- old/yast2-kdump-3.1.7/package/yast2-kdump.spec	2014-03-13 13:09:34.000000000 +0100
+++ new/yast2-kdump-3.1.8/package/yast2-kdump.spec	2014-03-19 10:54:00.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        3.1.7
+Version:        3.1.8
 Release:        0
 
 Url:            https://github.com/yast/yast-kdump
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.7/src/modules/Kdump.rb new/yast2-kdump-3.1.8/src/modules/Kdump.rb
--- old/yast2-kdump-3.1.7/src/modules/Kdump.rb	2014-03-13 13:09:34.000000000 +0100
+++ new/yast2-kdump-3.1.8/src/modules/Kdump.rb	2014-03-19 10:54:00.000000000 +0100
@@ -32,6 +32,8 @@
 
 module Yast
   class KdumpClass < Module
+    include Yast::Logger
+
     FADUMP_KEY = "KDUMP_FADUMP"
     KDUMP_SERVICE_NAME = "kdump"
 
@@ -670,17 +672,16 @@
     end
 
     TEMPORARY_CONFIG_FILE = "/var/lib/YaST2/kdump.sysconfig"
+    TEMPORARY_CONFIG_PATH = Path.new(".temporary.sysconfig.kdump")
 
     def write_temporary_config_file
-      # In inst_sys there is not kdump_file
-      return unless FileUtils.Exists(@kdump_file)
-
-      # FIXME parameterize Write instead of copying the old config
-      # NOTE make sure we do not lose 600 mode (cp is ok)
-      command = "cp #{@kdump_file} #{TEMPORARY_CONFIG_FILE}"
-      retcode = SCR.Execute(path(".target.bash"), command)
-      # if this fails the system is broken; SCR has logged the details
-      raise "cannot copy files" if retcode != 0
+      SCR.RegisterAgent(TEMPORARY_CONFIG_PATH,
+                        term(:ag_ini,
+                             term(:SysConfigFile, TEMPORARY_CONFIG_FILE)
+                             )
+                        )
+      WriteKdumpSettingsTo(TEMPORARY_CONFIG_PATH, TEMPORARY_CONFIG_FILE)
+      SCR.UnregisterAgent(TEMPORARY_CONFIG_PATH)
     end
 
     PROPOSE_ALLOCATED_MEMORY_MB_COMMAND = "kdumptool --configfile #{TEMPORARY_CONFIG_FILE} calibrate"
@@ -744,35 +745,33 @@
         "[kdump] (ReadAvailableMemory) total phys. memory [MB]: %1",
         Builtins.tostring(@total_memory)
       )
-      ProposeAllocatedMemory()
       true
     end
 
 
+    def log_settings_censoring_passwords(message)
+      debug_KDUMP_SETTINGS = deep_copy(@KDUMP_SETTINGS)
+      debug_KDUMP_SETTINGS["KDUMP_SAVEDIR"]       = "********"
+      debug_KDUMP_SETTINGS["KDUMP_SMTP_PASSWORD"] = "********"
+
+      log.info "-------------KDUMP_SETTINGS-------------------"
+      log.info "#{message}; here with censored passwords: #{debug_KDUMP_SETTINGS}"
+      log.info "---------------------------------------------"
+    end
 
     # Read current kdump configuration
     #
-    #  @return [Boolean] successfull
+    #  @return [Boolean] successful
     def ReadKdumpSettings
       @KDUMP_SETTINGS = deep_copy(@DEFAULT_CONFIG)
-      Builtins.foreach(SCR.Dir(path(".sysconfig.kdump"))) do |key|
+      SCR.Dir(path(".sysconfig.kdump")).each do |key|
         val = Convert.to_string(
-          SCR.Read(Builtins.add(path(".sysconfig.kdump"), key))
+          SCR.Read(path(".sysconfig.kdump") + key)
         )
-        Ops.set(@KDUMP_SETTINGS, key, val) if val != nil
+        @KDUMP_SETTINGS[key] = val
       end
 
-      debug_KDUMP_SETTINGS = deep_copy(@KDUMP_SETTINGS)
-
-      # delete KDUMP_SAVEDIR - it can include password
-      Ops.set(debug_KDUMP_SETTINGS, "KDUMP_SAVEDIR", "********")
-      Ops.set(debug_KDUMP_SETTINGS, "KDUMP_SMTP_PASSWORD", "********")
-      Builtins.y2milestone("-------------KDUMP_SETTINGS-------------------")
-      Builtins.y2milestone(
-        "kdump configuration has been read without value \"KDUMP_SAVEDIR\" and \"KDUMP_SMTP_PASSWORD\": %1",
-        debug_KDUMP_SETTINGS
-      )
-      Builtins.y2milestone("---------------------------------------------")
+      log_settings_censoring_passwords("kdump configuration has been read")
 
       @initial_kdump_settings = deep_copy(@KDUMP_SETTINGS)
 
@@ -805,42 +804,35 @@
       true
     end
 
+    # Writes a file in the /etc/sysconfig/kdump format
+    def WriteKdumpSettingsTo(scr_path, file_name)
+      log_settings_censoring_passwords("kdump configuration for writing")
+
+      @KDUMP_SETTINGS.each do |option_key, option_val|
+        SCR.Write(scr_path + option_key, option_val)
+      end
+      SCR.Write(scr_path, nil)
+
+      if checkPassword
+        Chmod(file_name, "600")
+      else
+        Chmod(file_name, "644")
+      end
+    end
+
     # Write current kdump configuration
     #
-    #  @return [Boolean] successfull
+    #  @return [Boolean] successful
     def WriteKdumpSettings
-      debug_KDUMP_SETTINGS = deep_copy(@KDUMP_SETTINGS)
-      # delete KDUMP_SAVEDIR - it can include password
-      Ops.set(debug_KDUMP_SETTINGS, "KDUMP_SAVEDIR", "********")
-      Ops.set(debug_KDUMP_SETTINGS, "KDUMP_SMTP_PASSWORD", "********")
-      Builtins.y2milestone("-------------KDUMP_SETTINGS-------------------")
-      Builtins.y2milestone(
-        "kdump configuration for writing without value \"KDUMP_SAVEDIR\" and \"KDUMP_SMTP_PASSWORD\": %1",
-        debug_KDUMP_SETTINGS
-      )
-      Builtins.y2milestone("---------------------------------------------")
-
-      Builtins.foreach(@KDUMP_SETTINGS) do |option_key, option_val|
-        SCR.Write(
-          Builtins.add(path(".sysconfig.kdump"), option_key),
-          option_val
-        )
-      end
-      SCR.Write(path(".sysconfig.kdump"), nil)
+      WriteKdumpSettingsTo(path(".sysconfig.kdump"), @kdump_file)
 
       if using_fadump_changed? && ! update_initrd
         return false
       end
 
-      if checkPassword
-        Chmod(@kdump_file, "600")
-      else
-        Chmod(@kdump_file, "644")
-      end
       true
     end
 
-
     # Write kdump boot argument crashkernel
     # set kernel-kdump start at boot
     #
@@ -1175,6 +1167,7 @@
       ReadAvailableMemory()
       # set default values for global variables
       ProposeGlobalVars()
+      ProposeAllocatedMemory()
 
       # add packages for installation
       AddPackages()

continue with "q"...


Checked in at Wed Mar 19 12:11:08 CET 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

ro

tags

participants (1)