Use kdump.rpm also on ppc64; kernel-kdump.rpm is gone (bnc#882062).

yast · Jun 30, 2014 · 168c46f · 168c46f
1 parent 568df5b
commit 168c46f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/src/include/kdump/complex.rb b/src/include/kdump/complex.rb
@@ -77,17 +77,8 @@ def ReadDialog
       # checking of installation packages
       kexec_installed = true if Package.Installed("kexec-tools")
 
-      kdump = ""
-
-      # only ppc64 includes package kernel-kdump
-      # others include kdump and kexec-tools depend on it
-
-      if Arch.ppc64
-        kdump = "kernel-kdump"
-      else
-        kdump = "kdump"
-      end
-
+      # kexec-tools depends on it.
+      kdump = "kdump"
       kdump_installed = true if Package.Installed(kdump)
 
       #checking if packages are available
@@ -143,8 +134,6 @@ def ReadDialog
         end
       end
 
-
-
       ret = Kdump.Read
       ret ? :next : :abort
     end

diff --git a/src/modules/Kdump.rb b/src/modules/Kdump.rb
@@ -520,7 +520,7 @@ def WriteKdumpSettings
     end
 
     # Write kdump boot argument crashkernel
-    # set kernel-kdump start at boot
+    # set kdump start at boot
     #
     #  @return [Boolean] successfull
     def WriteKdumpBootParameter
@@ -562,7 +562,7 @@ def WriteKdumpBootParameter
           return result
         end
 
-        # start kernel-kdump at boot
+        # start kdump at boot
         Service.Enable(KDUMP_SERVICE_NAME)
 
         Service.Restart(KDUMP_SERVICE_NAME) if Service.Status(KDUMP_SERVICE_NAME) == 0
@@ -740,7 +740,7 @@ def AddPackages
       return unless Mode.installation
 
       @kdump_packages << "kexec-tools"
-      @kdump_packages << (Arch.ppc64 ? "kernel-kdump" : "kdump")
+      @kdump_packages << "kdump"
     end
 
     # Propose global variables once...