ACK
On 26/10/11 15:31, mfoj...@redhat.com wrote:
> From: Bulat Shakirzyanov <mallluh...@gmail.com>
>
>
> Signed-off-by: Michal fojtik <mfoj...@redhat.com>
> ---
> server/bin/deltacloudd | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/server/bin/deltacloudd b/server/bin/deltacloudd
> index 46f5616..e8fca6e 100755
> --- a/server/bin/deltacloudd
> +++ b/server/bin/deltacloudd
> @@ -16,6 +16,8 @@
> # under the License.
> #
>
> +$:.unshift File.join(File.dirname(__FILE__), '..')
> +
> require 'rubygems'
> require 'optparse'
> require 'yaml'
> @@ -115,7 +117,10 @@ unless options[:drivers] or ENV["API_DRIVER"]
> end
>
> if options[:drivers]
> - require 'server.rb'
> + $top_srcdir = File.join(File.dirname(__FILE__), '..')
> + $:.unshift File.join($top_srcdir, 'lib')
> + server_dir = ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud'
> + load File.join($top_srcdir, 'lib', server_dir, 'server.rb')
> puts "Available drivers:\n\n"
> puts "* " + driver_config.keys.map{ |d| d.to_s }.join("\n* ")
> puts
