merge back missing changes from one-1.4

git-svn-id: http://svn.opennebula.org/one/trunk@953 3034c82b-c49b-4eb3-8279-a7acafdc01c0
fairchild · Dec 16, 2009 · d495181 · d495181
1 parent 9272141
commit d495181
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@