Permalink
Browse files

- Solaris 11 Template now completely compiles all necessary components

- Fixed the location of the validation dir, this should not be created if not existing. It is actually part of the code provided by the gem
  • Loading branch information...
jedi4ever committed May 3, 2011
1 parent 3ecec2f commit 27c31ba6f52dbe18ab88e151b89f1ec2f10c421f
View
@@ -12,10 +12,11 @@
tmp_dir=File.expand_path(File.join(veewee_dir, "tmp"))
iso_dir=File.expand_path(File.join(veewee_dir, "iso"))
box_dir=File.expand_path(File.join(veewee_dir, "boxes"))
+validation_dir=File.expand_path(File.join(veewee_dir, "validation"))
#Initialize
Veewee::Session.setenv({:veewee_dir => veewee_dir, :definition_dir => definition_dir,
- :template_dir => template_dir, :iso_dir => iso_dir, :box_dir => box_dir, :tmp_dir => tmp_dir})
+ :template_dir => template_dir, :iso_dir => iso_dir, :box_dir => box_dir, :tmp_dir => tmp_dir, :validation_dir => validation_dir})
module Veewee
class Command < Vagrant::Command::GroupBase
View
@@ -22,7 +22,7 @@ def self.setenv(env)
@veewee_dir=env[:veewee_dir]
@definition_dir=env[:definition_dir]
@template_dir=env[:template_dir]
- @validation_dir=env[:veewee_dir] + 'validation'
+ @validation_dir=env[:validation_dir]
@box_dir=env[:box_dir]
@iso_dir=env[:iso_dir]
@tmp_dir=env[:tmp_dir]
@@ -459,7 +459,7 @@ def self.destroy_vm(boxname)
end
def self.create_vm(boxname,force=false)
-
+
#Verifying the os.id with the :os_type_id specified
matchfound=false
VirtualBox::Global.global.lib.virtualbox.guest_os_types.collect { |os|
@@ -500,12 +500,6 @@ def self.create_vm(boxname,force=false)
#Exec and system stop the execution here
Veewee::Shell.execute("#{command}")
-
- #Set a shared folder for validation
- if !File.exists?(@validation_dir)
- FileUtils.mkdir(File.expand_path(@validation_dir))
- end
-
command="#{@vboxcmd} sharedfolder add '#{boxname}' --name 'veewee-validation' --hostpath '#{File.expand_path(@validation_dir)}' --automount"
Veewee::Shell.execute("#{command}")
View
@@ -1,3 +1,3 @@
module Veewee
- VERSION = "0.1.19"
+ VERSION = "0.1.20"
end
@@ -64,6 +64,11 @@ cd /tmp
/usr/bin/pkgtrans VirtualBox-4.0.6-SunOS-r71344.pkg . all
yes|/usr/sbin/pkgadd -d . SUNWvbox
+# Fix the shells to include the /opt/csw directories
+
+echo "export PATH=/opt/csw/bin:/opt/csw/sbin/:$PATH" >> /root/.profile
+echo "export PATH=/opt/csw/bin:/opt/csw/sbin/:$PATH" >> /export/home/vagrant/.profile
+
exit
#Inspiration for ruby enterprise

0 comments on commit 27c31ba

Please sign in to comment.