From d495181a32af0e9ed52c28592a85c47848bfc8e9 Mon Sep 17 00:00:00 2001
From: ruben <ruben@3034c82b-c49b-4eb3-8279-a7acafdc01c0>
Date: Wed, 16 Dec 2009 15:27:20 +0000
Subject: [PATCH] merge back missing changes from one-1.4

git-svn-id: http://svn.opennebula.org/one/trunk@953 3034c82b-c49b-4eb3-8279-a7acafdc01c0
---
 share/hooks/ebtables-kvm |  2 +-
 share/scripts/one        | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/share/hooks/ebtables-kvm b/share/hooks/ebtables-kvm
index 6cd909e..5900791 100755
--- a/share/hooks/ebtables-kvm
+++ b/share/hooks/ebtables-kvm
@@ -55,7 +55,7 @@ def get_interfaces
     end
 end
 
-nets=`virsh dumpxml #{VM_NAME}`
+nets=`virsh -c qemu:///system dumpxml #{VM_NAME}`
 
 doc=REXML::Document.new(nets).root
 
diff --git a/share/scripts/one b/share/scripts/one
index 94d2220..067646a 100755
--- a/share/scripts/one
+++ b/share/scripts/one
@@ -83,11 +83,13 @@ start()
 	fi
 
     if [ ! -f "$ONE_DB" ]; then
-        if [ -z "$ONE_AUTH" ]; then
-            echo "You should have ONE_AUTH set the first time you start"
-            echo "OpenNebula as it is used to set the credentials for"
-            echo "the adminitrator user."
-            exit 1
+        if [ ! -f "$HOME/.one/one_auth" ]; then
+            if [ -z "$ONE_AUTH" ]; then
+                echo "You should have ONE_AUTH set the first time you start"
+                echo "OpenNebula as it is used to set the credentials for"
+                echo "the adminitrator user."
+                exit 1
+            fi
         fi
     fi