Skip to content

Commit e8728e2

Browse files
committed
Fixes #38772 - Get rid of Grub (not grub2)
Follow up to theforeman/foreman#10698
1 parent a494fb3 commit e8728e2

File tree

4 files changed

+1
-31
lines changed

4 files changed

+1
-31
lines changed

modules/tftp/server.rb

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,6 @@ def pxeconfig_file(mac)
9292
end
9393
end
9494
class Pxelinux < Syslinux; end
95-
96-
class Pxegrub < Server
97-
def pxeconfig_dir
98-
"#{path}/grub"
99-
end
100-
101-
def pxe_default
102-
["#{pxeconfig_dir}/menu.lst", "#{pxeconfig_dir}/efidefault"]
103-
end
104-
105-
def pxeconfig_file(mac)
106-
["#{pxeconfig_dir}/menu.lst.01" + mac.delete(':').upcase, "#{pxeconfig_dir}/01-" + dashed_mac(mac).upcase]
107-
end
108-
end
109-
11095
class Pxegrub2 < Server
11196
def bootloader_path(os, release, arch)
11297
[release, "default"].each do |version|

modules/tftp/tftp_api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Api < ::Sinatra::Base
88
helpers ::Proxy::Helpers
99
authorize_with_trusted_hosts
1010
authorize_with_ssl_client
11-
VARIANTS = ["Syslinux", "Pxelinux", "Pxegrub", "Pxegrub2", "Ztp", "Poap", "Ipxe"].freeze
11+
VARIANTS = ["Syslinux", "Pxelinux", "Pxegrub2", "Ztp", "Poap", "Ipxe"].freeze
1212

1313
helpers do
1414
def instantiate(variant, mac = nil)

test/tftp/tftp_api_test.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ def test_instantiate_pxelinux
3030
assert_equal "Proxy::TFTP::Pxelinux", obj.class.name
3131
end
3232

33-
def test_instantiate_pxegrub
34-
obj = app.helpers.instantiate "pxegrub", "AA:BB:CC:DD:EE:FF"
35-
assert_equal "Proxy::TFTP::Pxegrub", obj.class.name
36-
end
37-
3833
def test_instantiate_pxegrub2
3934
obj = app.helpers.instantiate "pxegrub2", "AA:BB:CC:DD:EE:FF"
4035
assert_equal "Proxy::TFTP::Pxegrub2", obj.class.name

test/tftp/tftp_server_test.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,6 @@ def setup_paths
102102
end
103103
end
104104

105-
class TftpPxegrubServerTest < Test::Unit::TestCase
106-
include TftpGenericServerSuite
107-
108-
def setup_paths
109-
@subject = Proxy::TFTP::Pxegrub.new
110-
@pxe_config_files = ["grub/menu.lst.01AABBCCDDEEFF", "grub/01-AA-BB-CC-DD-EE-FF"]
111-
@pxe_default_files = ["grub/menu.lst", "grub/efidefault"]
112-
end
113-
end
114-
115105
class TftpPxegrub2ServerTest < Test::Unit::TestCase
116106
include TftpGenericServerSuite
117107

0 commit comments

Comments
 (0)