Skip to content

Commit

Permalink
Merge pull request #60 from yast/fix_bootloader_usage
Browse files Browse the repository at this point in the history
Fix bootloader usage
  • Loading branch information
jreidinger committed Apr 13, 2016
2 parents 7321e96 + f922f31 commit b7bdab2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ before_install:
# disable rvm, use system Ruby
- rvm reset
- wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
- sh ./travis_setup.sh -p "rake yast2-devtools yast2 yast2-packager yast2-storage yast2-bootloader" -g "rspec:3.3.0 yast-rake gettext simplecov coveralls"
- sh ./travis_setup.sh -p "rake yast2-devtools yast2 yast2-packager yast2-storage yast2-bootloader ruby2.1-dev libaugeas-dev pkg-config" -g "rspec:3.3.0 yast-rake gettext simplecov coveralls cfa_grub2 cheetah"
script:
- rake check:syntax
- rake check:pot
Expand Down
7 changes: 7 additions & 0 deletions package/yast2-kdump.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Apr 13 11:47:38 UTC 2016 - jreidinger@suse.com

- Remove unused import of dropped BootCommon package
(related to FATE#317701)
- 3.1.37

-------------------------------------------------------------------
Wed Jan 13 12:56:29 UTC 2016 - igonzalezsosa@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-kdump.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-kdump
Version: 3.1.36
Version: 3.1.37
Release: 0
Summary: Configuration of kdump
License: GPL-2.0
Expand Down
31 changes: 0 additions & 31 deletions src/modules/Kdump.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def main
Yast.import "Report"
Yast.import "Summary"
Yast.import "Message"
Yast.import "BootCommon"
Yast.import "Map"
Yast.import "Bootloader"
Yast.import "Service"
Expand All @@ -80,21 +79,9 @@ def reset

@proposal_valid = false

# List of available partiotions
# with known partition
#
# list <string>
@available_partitions = []

# true if propose was called
@propose_called = false

# List of available partiotions
# without filesystem or with uknown
#
# list <string>
@uknown_fs_partitions = []

# Boolean option indicates that "crashkernel" includes
# several values for the same kind of memory (low, high)
# or several ranges in one of the values
Expand All @@ -105,22 +92,6 @@ def reset
# list of packages for installation
@kdump_packages = []

# Number of cpus
#
# integer
@number_of_cpus = 1

# kernel version (uname -r)
#
# string
@kernel_version = ""

# Position actual boot section in BootCommon::sections list
# it is relevant only if XEN boot section is used
#
# integer
@section_pos = -1

# Boolean option indicates kernel parameter
# "crashkernel"
#
Expand Down Expand Up @@ -1018,9 +989,7 @@ def high_memory_supported?
publish :function => :SetModified, :type => "void ()"
publish :variable => :modified, :type => "boolean"
publish :variable => :proposal_valid, :type => "boolean"
publish :variable => :available_partitions, :type => "list <string>"
publish :variable => :propose_called, :type => "boolean"
publish :variable => :uknown_fs_partitions, :type => "list <string>"
publish :function => :total_memory, :type => "integer ()"
publish :variable => :crashkernel_list_ranges, :type => "boolean"
publish :variable => :kdump_packages, :type => "list <string>"
Expand Down

0 comments on commit b7bdab2

Please sign in to comment.