Skip to content

Commit

Permalink
write the preseed.cfg/default straight, dropping ubuntu menus
Browse files Browse the repository at this point in the history
  • Loading branch information
mattray authored and jtimberman committed Nov 9, 2011
1 parent 1a1a8be commit 30b077e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 43 deletions.
45 changes: 10 additions & 35 deletions pxe_dust/recipes/server.rb
Expand Up @@ -81,34 +81,6 @@
action :nothing
end

#skips the prompt for which installer to use
template "#{image_dir}/pxelinux.cfg/default" do
source "syslinux.cfg.erb"
mode "0644"
variables(
:id => id,
:arch => arch
)
action :create
end

#sets the URL to the preseed
template "#{image_dir}/ubuntu-installer/#{arch}/boot-screens/(txt.cfg|text.cfg)" do
if version == 'lucid'
path "#{image_dir}/ubuntu-installer/#{arch}/boot-screens/text.cfg"
else
path "#{image_dir}/ubuntu-installer/#{arch}/boot-screens/txt.cfg"
end
source "txt.cfg.erb"
mode "0644"
variables(
:id => id,
:arch => arch,
:domain => domain
)
action :create
end

link "#{node['tftp']['directory']}/pxe-#{id}.0" do
to "#{id}/pxelinux.0"
end
Expand Down Expand Up @@ -143,17 +115,20 @@

end

#defaults are linked for when only a single image is supported (ie. no dhcpd)
#configure the defaults
link "#{node['tftp']['directory']}/pxelinux.0" do
to "default/pxelinux.0"
end

link "#{node['tftp']['directory']}/pxelinux.cfg/default" do
to "../default/pxelinux.cfg/default"
end

link "#{node['tftp']['directory']}/ubuntu-installer" do
to "default/ubuntu-installer"
template "#{node['tftp']['directory']}/pxelinux.cfg/default" do
source "pxelinux.cfg.erb"
mode "0644"
variables(
:id => 'default',
:arch => default['arch'],
:domain => default['domain']
)
action :create
end

#link the validation_key where it can be downloaded
Expand Down
@@ -1,7 +1,9 @@
localboot 0
prompt 0
timeout 0
localboot 0
default install
label install
menu label ^Install-Opscode
menu label Chef pxe_dust <%= @id %>
menu default
kernel ubuntu-installer/<%= @arch %>/linux
kernel <%= @id %>/ubuntu-installer/<%= @arch %>/linux
append auto=true priority=critical interface=eth0 vga16fb.modeset=0 initrd=<%= @id %>/ubuntu-installer/<%= @arch %>/initrd.gz netcfg/disabledhcp=false locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us netcfg/get_hostname=dummy netcfg/get_domain=<%= @domain %> netcfg/chooseinterface=eth0 url=http://<%= node[:ipaddress] %>/<%= @id %>-preseed.cfg DEBCONF_INTERFACE=noninteractive
5 changes: 0 additions & 5 deletions pxe_dust/templates/default/syslinux.cfg.erb

This file was deleted.

0 comments on commit 30b077e

Please sign in to comment.