neerolyte / lyte-vagrant-boxes Goto Github PK

diff --git a/definitions/sl6-64-lyte/definition.rb b/definitions/sl6-64-lyte/definition.rb
index fe4008a..e226ff8 100644
--- a/definitions/sl6-64-lyte/definition.rb
+++ b/definitions/sl6-64-lyte/definition.rb
@@ -6,8 +6,10 @@ Veewee::Session.declare({
   :hostiocache => 'off',
   :virtualbox => {
     :vm_options => [
-      "ioapic" => "on",
-      "pae" => "on"
+      :ioapic => 'on',
+      :pae => 'on',
+      :natdnsproxy1 => 'off',
+      :natdnshostresolver1 => 'on'
     ]
   },
   :os_type_id => 'RedHat_64',
@@ -16,10 +18,10 @@ Veewee::Session.declare({
   :iso_md5 => "e9625e2c3b4b02d94ffa478773d5d58f",
   :iso_download_timeout => 1000,
   :boot_wait => "15",
-  :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
+  :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg.erb<Enter>' ],
+  :kickstart_file => "ks.cfg.erb",
   :kickstart_port => "7122",
   :kickstart_timeout => 10000,
-  :kickstart_file => "ks.cfg",
   :ssh_login_timeout => "10000",
   :ssh_user => "vagrant",
   :ssh_password => "vagrant",
@@ -34,5 +36,8 @@ Veewee::Session.declare({
     "virtualbox.sh",
     "cleanup.sh"
   ],
-  :postinstall_timeout => 10000
+  :postinstall_timeout => 10000,
+  :params => {
+    :proxy => 'http://host.local.vm:3142'
+  },
 })

--- definitions/sl6-64-lyte/ks.cfg  2013-06-16 02:11:48.000000000 +1000
+++ definitions/sl6-64-lyte/ks.cfg.erb  2013-06-16 12:22:07.000000000 +1000
@@ -1,5 +1,5 @@
-install
-url --url=http://10.13.0.1:3142/mirror.aarnet.edu.au/pub/scientific/6.3/x86_64/os
+<% proxy = @ui.env.definitions[@ui.resource].params[:proxy] || '' %>install
+url --url=http://mirror.aarnet.edu.au/pub/scientific/6.3/x86_64/os <%= proxy && '--proxy=' + proxy %>
 lang en_US.UTF-8
 keyboard us
 network --bootproto dhcp
@@ -88,6 +88,7 @@
 -mailx

 %post
+<% if not proxy.empty? %>echo "proxy=<%= proxy %>" >> /etc/yum.conf<% end %>
 /usr/sbin/groupadd vagrant
 /usr/sbin/useradd vagrant -g vagrant -G wheel
 echo "vagrant" | passwd --stdin vagrant