[Xen-changelog] [xen-unstable] [TPM] Check the existence of the xenstore path before trying to read from it.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID f247e0b52dda257c0000c9da5a0cdff507b3ced8
# Parent  71e2a165aa7f81602c569430b18ba1ea705f0b70
[TPM] Check the existence of the xenstore path before trying to read from it.
This prevents an error from being logged. Use the wrapped command for
reading from the xenstore instead of the native one.

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 tools/examples/vtpm-common.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff -r 71e2a165aa7f -r f247e0b52dda tools/examples/vtpm-common.sh
--- a/tools/examples/vtpm-common.sh     Wed Oct 18 18:35:21 2006 +0100
+++ b/tools/examples/vtpm-common.sh     Wed Oct 18 18:37:18 2006 +0100
@@ -226,7 +226,7 @@ function vtpmdb_remove_entry () {
 # Returns 'resume' or 'create'
 function vtpm_get_create_reason () {
        local resume
-       resume=$(xenstore-read $XENBUS_PATH/resume)
+       resume=$(xenstore_read $XENBUS_PATH/resume)
        if [ "$resume" == "True" ]; then
                echo "resume"
        else
@@ -287,6 +287,8 @@ function vtpm_create_instance () {
 #entry is kept in the VTPMDB file.
 function vtpm_remove_instance () {
        local instance reason domname
+       #Stop script execution quietly if path does not exist (anymore)
+       xenstore-exists "$XENBUS_PATH"/domain
        domname=$(xenstore_read "$XENBUS_PATH"/domain)
 
        if [ "$domname" != "" ]; then
@@ -383,7 +385,7 @@ function vtpm_domid_from_name () {
        local id name ids
        ids=$(xenstore-list /local/domain)
        for id in $ids; do
-               name=$(xenstore-read /local/domain/$id/name)
+               name=$(xenstore_read /local/domain/$id/name)
                if [ "$name" == "$1" ]; then
                        echo "$id"
                        return

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog