diff --git a/src/cli/oneimage b/src/cli/oneimage index a401b393cf..349c7916cc 100755 --- a/src/cli/oneimage +++ b/src/cli/oneimage @@ -160,7 +160,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do end chtype_desc = <<-EOT.unindent - Changes the Image group + Changes the Image's type EOT command :chtype, chtype_desc,[:range, :imageid_list], :type do diff --git a/src/cli/oneuser b/src/cli/oneuser index 4a7c8cd784..293ecbcac1 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -173,7 +173,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do end end - driver = options[:driver] || OpenNebula::User::CORE + driver = options[:driver] || OpenNebula::User::CORE_AUTH helper.create_resource(options) do |user| user.allocate(args[0], pass, driver) diff --git a/src/image/ImageManagerActions.cc b/src/image/ImageManagerActions.cc index 18193f7aa9..0b625a2818 100644 --- a/src/image/ImageManagerActions.cc +++ b/src/image/ImageManagerActions.cc @@ -287,6 +287,7 @@ int ImageManager::enable_image(int iid, bool to_enable) int ImageManager::delete_image(int iid) { Image * img; + string source; img = ipool->get(iid,true); @@ -324,7 +325,25 @@ int ImageManager::delete_image(int iid) return -1; } - imd->rm(img->get_oid(),img->get_source()); + source = img->get_source(); + + if (source.empty()) + { + string err_str; + int rc; + + rc = ipool->drop(img, err_str); + + if ( rc < 0 ) + { + NebulaLog::log("ImM",Log::ERROR, + "Image could not be removed from DB"); + } + } + else + { + imd->rm(img->get_oid(),img->get_source()); + } img->unlock(); diff --git a/src/image/ImageManagerDriver.cc b/src/image/ImageManagerDriver.cc index e352f79d96..9a9db4ddb7 100644 --- a/src/image/ImageManagerDriver.cc +++ b/src/image/ImageManagerDriver.cc @@ -223,9 +223,7 @@ void ImageManagerDriver::protocol( { int rc; string tmp_error; - - source = image->get_source(); - + rc = ipool->drop(image, tmp_error); if ( rc < 0 )