Project

General

Profile

« Previous | Next » 

Revision 9f858eb4

Added by Johannes Scheuermann about 9 years ago

Fixes #9362 - Corrected CoreOS mediapath

View differences:

app/models/operatingsystems/coreos.rb
'coreos'
end
# Simple output of the media url
def mediumpath(host)
medium_uri(host, "#{host.medium.path}/#{pxedir}").to_s
medium_uri(host, "#{host.medium.path}/#{host.architecture.name}-usr").to_s.gsub('x86_64','amd64')
end
def url_for_boot(file)
......
end
def pxedir
'amd64-usr/$version'
'$arch/$version'
end
def boot_files_uri(medium, architecture, host = nil)
super(medium, architecture, host).each{ |img_uri| img_uri.path = img_uri.path.gsub('x86_64','amd64-usr') }
end
def display_family
......
def self.model_name
superclass.model_name
end
end
end
test/unit/operatingsystems/operatingsystems_test.rb
end
end
{ :coreos => { 'os' => :coreos, 'arch' => :x86_64, 'expected' => 'amd64-usr/$version' },
{ :coreos => { 'os' => :coreos, 'arch' => :x86_64, 'expected' => '$arch/$version' },
:debian7_0 => { 'os' => :debian7_0, 'arch' => :x86_64, 'expected' => 'dists/$release/main/installer-$arch/current/images/netboot/debian-installer/$arch' },
:ubuntu14_10 => { 'os' => :ubuntu14_10, 'arch' => :x86_64, 'expected' => 'dists/$release/main/installer-$arch/current/images/netboot/ubuntu-installer/$arch' },
:suse => { 'os' => :suse, 'arch' => :x86_64, 'expected' => 'boot/$arch/loader' } }.

Also available in: Unified diff