Merge pull request #456 from edgester/debian-squeeze-fixes

Debian squeeze fixes
jedi4ever · Jan 17, 2013 · d7f6a2f · d7f6a2f
2 parents 6bf6580 + d9bfea8
commit d7f6a2f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/templates/Debian-6.0.5-i386-netboot/preseed.cfg b/templates/Debian-6.0.5-i386-netboot/preseed.cfg
@@ -66,7 +66,7 @@ d-i netcfg/wireless_wep string
 # If you select ftp, the mirror/country string does not need to be set.
 #d-i mirror/protocol string ftp
 d-i mirror/country string manual
-d-i mirror/http/hostname string http.us.debian.org
+d-i mirror/http/hostname string ftp.us.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 

diff --git a/templates/Debian-6.0.6-i386-netboot/definition.rb b/templates/Debian-6.0.6-i386-netboot/definition.rb
@@ -3,8 +3,15 @@
 Veewee::Definition.declare({
   :cpu_count => '1',
   :memory_size=> '256',
-  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'on',
   :os_type_id => 'Debian',
+  :virtualbox => { :vm_options => [ 
+                                   'hwvirtex' => 'off',
+                                   'hwvirtexexcl' => 'off', 
+                                   'nestedpaging' => 'off',
+                                   'natdnshostresolver1' => 'on'
+                                  ]
+                          },
   :iso_file => "debian-6.0.6-i386-netinst.iso",
   :iso_src => "http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-cd/debian-6.0.6-i386-netinst.iso",
   :iso_md5 => "a5fdc1b74cd573d505a084baf7cc1462",

diff --git a/templates/Debian-6.0.6-i386-netboot/preseed.cfg b/templates/Debian-6.0.6-i386-netboot/preseed.cfg
@@ -66,7 +66,7 @@ d-i netcfg/wireless_wep string
 # If you select ftp, the mirror/country string does not need to be set.
 #d-i mirror/protocol string ftp
 d-i mirror/country string manual
-d-i mirror/http/hostname string http.us.debian.org
+d-i mirror/http/hostname string ftp.us.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string