diff --git a/manifests/installer.pp b/manifests/installer.pp index 92dee21..fc79352 100644 --- a/manifests/installer.pp +++ b/manifests/installer.pp @@ -1,6 +1,6 @@ # Define: pxe::installer # -# Downlaods the requested image and sets up a generic installation entry for +# Downloads the requested image and sets up a generic installation entry for # each image. # define pxe::installer ( diff --git a/manifests/syslinux/system.pp b/manifests/syslinux/system.pp index c5874a2..63b0ccb 100644 --- a/manifests/syslinux/system.pp +++ b/manifests/syslinux/system.pp @@ -9,23 +9,9 @@ require => Package['syslinux'], } - file { "${tftp_root}/syslinux/menu.c32": - source => "${syslinux_dir}/menu.c32", - require => Package['syslinux'], - } - - file { "${tftp_root}/syslinux/vesamenu.c32": - source => "${syslinux_dir}/vesamenu.c32", - require => Package['syslinux'], - } - - file { "${tftp_root}/syslinux/reboot.c32": - source => "${syslinux_dir}/reboot.c32", - require => Package['syslinux'], - } - - file { "${tftp_root}/syslinux/memdisk": - source => "${syslinux_dir}/memdisk", + File["${tftp_root}/syslinux"] { + source => $syslinux_dir, + recurse => true, require => Package['syslinux'], } } diff --git a/spec/classes/syslinux/system_spec.rb b/spec/classes/syslinux/system_spec.rb index fdcf5b2..7c3c418 100644 --- a/spec/classes/syslinux/system_spec.rb +++ b/spec/classes/syslinux/system_spec.rb @@ -13,6 +13,9 @@ it { is_expected.to contain_package('syslinux') } it { is_expected.to contain_file('/srv/tftp/pxelinux.0') } + it { is_expected.to contain_file('/srv/tftp/syslinux/ldlinux.c32') } + it { is_expected.to contain_file('/srv/tftp/syslinux/libcom32.c32') } + it { is_expected.to contain_file('/srv/tftp/syslinux/libutil.c32') } it { is_expected.to contain_File('/srv/tftp/syslinux/memdisk') } it { is_expected.to contain_File('/srv/tftp/syslinux/menu.c32') } it { is_expected.to contain_file('/srv/tftp/syslinux/reboot.c32') }