From 403a6a0e5195eb8bbf0f60dcfe62fa5adeb39cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= <tinova@fdi.ucm.es>
Date: Fri, 16 Oct 2009 11:10:05 +0000
Subject: [PATCH] Fixed DB initialization problem

git-svn-id: http://svn.opennebula.org/one/trunk@863 3034c82b-c49b-4eb3-8279-a7acafdc01c0
---
 src/cloud/common/CloudServer.rb   | 3 +--
 src/cloud/ec2/lib/econe-server.rb | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/cloud/common/CloudServer.rb b/src/cloud/common/CloudServer.rb
index 8034877d8e..57b25ecb81 100644
--- a/src/cloud/common/CloudServer.rb
+++ b/src/cloud/common/CloudServer.rb
@@ -16,7 +16,6 @@
 #--------------------------------------------------------------------------- #
 
 require 'repo_manager'
-require 'image'
 require 'Configuration'
 require 'OpenNebula'
 require 'pp'
@@ -60,8 +59,8 @@ class CloudServer
 
         # --- Start a Repository Manager ---
     
-        Image.image_dir = @config[:image_dir]
         @rm = RepoManager.new(@config[:database])
+        Image.image_dir = @config[:image_dir]
 
         # --- Start an OpenNebula Session ---
         
diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb
index 39dd7a6a99..9b938c3d6b 100644
--- a/src/cloud/ec2/lib/econe-server.rb
+++ b/src/cloud/ec2/lib/econe-server.rb
@@ -24,7 +24,7 @@ if !ONE_LOCATION
     RUBY_LIB_LOCATION  = "/usr/lib/one/ruby"
     CONFIGURATION_FILE = "/etc/one/econe.conf"
     TEMPLATE_LOCATION  = "/etc/one/ec2query_templates"
-    DB_LOCATION        = "/var/lib/one/econe.rb"
+    DB_LOCATION        = "/var/lib/one/econe.db"
 else
     RUBY_LIB_LOCATION  = ONE_LOCATION+"/lib/ruby"
     CONFIGURATION_FILE = ONE_LOCATION+"/etc/econe.conf"