changes be-latin1 to us; added yum clean all; fixed an nil for savestate

mdxp · Feb 12, 2011 · b2302de · b2302de
1 parent 1dbff17
commit b2302de
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/lib/veewee/session.rb b/lib/veewee/session.rb
@@ -214,7 +214,7 @@ def self.build(boxname,options)
 
         vm=VirtualBox::VM.find(boxname)
 
-        if vm.saved?
+        if (!vm.nil? && !(vm.saved?))
           puts "Removing save state"
           vm.discard_state
           vm.reload

diff --git a/templates/CentOS-4.8-i386/postinstall.sh b/templates/CentOS-4.8-i386/postinstall.sh
@@ -9,7 +9,9 @@ yum -y install gcc bzip2 make kernel-devel-`uname -r`
 yum -y install gcc-c++ zlib-devel openssl-devel readline-devel sqlite3-devel     
 
 yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
-
+
+yum -y clean all
+
 #Installing ruby
 wget http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz
 tar xzvf ruby-enterprise-1.8.7-2010.02.tar.gz

diff --git a/templates/CentOS-5.5-i386-netboot/ks.cfg b/templates/CentOS-5.5-i386-netboot/ks.cfg
@@ -4,7 +4,7 @@ install
 url --url=http://mirror.bytemark.co.uk/centos/5.5/os/i386
 lang en_US.UTF-8
 langsupport --default=en_US.UTF-8 en_US.UTF-8
-keyboard uk
+keyboard us
 xconfig --card "VMWare" --videoram 16384 --hsync 31.5-37.9 --vsync 50-70 --resolution 800x600 --depth 16
 network --device eth0 --bootproto dhcp
 rootpw --iscrypted $1$vSG8FjAu$ekQ0grf16hS4G93HTPcco/

diff --git a/templates/CentOS-5.5-i386-netboot/postinstall.sh b/templates/CentOS-5.5-i386-netboot/postinstall.sh
@@ -10,6 +10,9 @@ yum -y install gcc-c++ zlib-devel openssl-devel readline-devel sqlite3-devel
 
 yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
 
+
+yum -y clean all
+
 #Installing ruby
 wget http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz
 tar xzvf ruby-enterprise-1.8.7-2010.02.tar.gz

diff --git a/templates/CentOS-5.5-i386/ks.cfg b/templates/CentOS-5.5-i386/ks.cfg
@@ -4,7 +4,7 @@ install
 cdrom
 lang en_US.UTF-8
 langsupport --default=en_US.UTF-8 en_US.UTF-8
-keyboard be-latin1
+keyboard us
 xconfig --card "VMWare" --videoram 16384 --hsync 31.5-37.9 --vsync 50-70 --resolution 800x600 --depth 16
 network --device eth0 --bootproto dhcp
 rootpw --iscrypted $1$vSG8FjAu$ekQ0grf16hS4G93HTPcco/

diff --git a/templates/CentOS-5.5-i386/postinstall.sh b/templates/CentOS-5.5-i386/postinstall.sh
@@ -9,6 +9,8 @@ yum -y install gcc bzip2 make kernel-devel-`uname -r`
 yum -y install gcc-c++ zlib-devel openssl-devel readline-devel sqlite3-devel     
 
 yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+
+yum -y clean all
 
 #Installing ruby
 wget http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz