Added a freebsd netinstaller

Renamed the template definitions
jedi4ever · Apr 27, 2011 · 2859314 · 2859314
1 parent 5d0a55b
commit 2859314
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,7 +7,7 @@ PATH
       net-ssh (~> 2.1.0)
       popen4 (~> 0.1.2)
       progressbar
-      rspec
+      rspec (~> 2.5.0)
       thor (~> 0.14.6)
       vagrant (~> 0.7.0)
 

diff --git a/lib/veewee/session.rb b/lib/veewee/session.rb
@@ -296,7 +296,7 @@ def self.build(boxname,options)
             Veewee::Ssh.when_ssh_login_works("localhost",ssh_options) do
               #Transfer version of Virtualbox to $HOME/.vbox_version            
               versionfile=Tempfile.open("vbox.version")
-              versionfile.puts "#{VirtualBox::Global.global.lib.virtualbox.version}.split('_')[0)"
+              versionfile.puts "#{VirtualBox::Global.global.lib.virtualbox.version.split('_')[0]}"
               versionfile.rewind
               begin
                 Veewee::Ssh.transfer_file("localhost",versionfile.path,".vbox_version", ssh_options)

diff --git a/lib/veewee/ssh.rb b/lib/veewee/ssh.rb
@@ -110,15 +110,15 @@ def self.execute(host,command, options = { :progress => "on"} )
               ch.on_data do |c, data|
                 @stdout+=data
 
-                  puts data
+                  print data
 
               end
 
               # "on_extended_data" is called when the process writes something to stderr
               ch.on_extended_data do |c, type, data|
                 @stderr+=data
 
-                  puts data
+                  print data
 
               end
 

diff --git a/...bsd-8.2-i386-pcbsdinstaller/definition.rb → ...ates/freebsd-8.2-pcbsd-i386/definition.rb b/...bsd-8.2-i386-pcbsdinstaller/definition.rb → ...ates/freebsd-8.2-pcbsd-i386/definition.rb
diff --git a/...8.2-i386-pcbsdinstaller/pcinstall.fbg.cfg → .../freebsd-8.2-pcbsd-i386/pcinstall.fbg.cfg b/...8.2-i386-pcbsdinstaller/pcinstall.fbg.cfg → .../freebsd-8.2-pcbsd-i386/pcinstall.fbg.cfg
@@ -27,7 +27,7 @@ commitDiskPart
 disk0-part=UFS+S 1024 /
 disk0-part=SWAP 1534 none
 disk0-part=UFS+S 2048 /var
-disk0-part=UFS+S 5629 /usr
+disk0-part=UFS+S 5529 /usr
 commitDiskLabel
 
 # List our components to install
@@ -54,4 +54,4 @@ runCommand=sed -i -e 's@auth.*include.*system@@' /etc/pam.d/su
 
 # making the clock run correctly 
 # http://forums.virtualbox.org/viewtopic.php?f=11&t=12210&start=0
-runCommand=echo 'kern.hz=100' > /boot/loader.conf
+# runCommand=echo 'kern.hz=100' > /boot/loader.conf
diff --git a/...sd-8.2-i386-pcbsdinstaller/postinstall.sh → ...tes/freebsd-8.2-pcbsd-i386/postinstall.sh b/...sd-8.2-i386-pcbsdinstaller/postinstall.sh → ...tes/freebsd-8.2-pcbsd-i386/postinstall.sh