summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKiran Kamineni <kiran.k.kamineni@intel.com>2019-03-29 21:17:20 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-29 21:17:20 +0000
commitac7b25a982dfabc8bd69a13c8b8a2ce094e32205 (patch)
tree758c531d7f5eac07295dddcdc364b0574e7ffa32
parentb50920e538a6e0b6a1ee4835f59956835efe3f7f (diff)
parente9d7749328010a7d243c4eabb5e61a59932ecbcb (diff)
Merge "Update Initialization tool"
-rwxr-xr-xbin/abrmdcontainer/create_primary.sh6
-rwxr-xr-xbin/abrmdcontainer/run_abrmd.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/abrmdcontainer/create_primary.sh b/bin/abrmdcontainer/create_primary.sh
index 3d4f0f9..dec3f75 100755
--- a/bin/abrmdcontainer/create_primary.sh
+++ b/bin/abrmdcontainer/create_primary.sh
@@ -24,10 +24,10 @@ tpm2_readpublic -H ${SRKHANDLE} --opu out_primary_public -T device -V
if [ $? -ne 0 ]; then echo; echo -e "${YELLOW} Primary Key does not exist, creating...";
rm -f PrimaryKeyBlob
- echo "tpm2_createprimary -P ${O_PASSWORD} -K ${KEY_PASSWORD} -A o -g 0x000B
+ echo "tpm2_createprimary -P ${O_PASSWORD} -K ${KEY_PASSWORD} -H o -g 0x000B
-G 0x0001 -T device -V -C PrimaryKeyBlob"
- tpm2_createprimary -P ${O_PASSWORD} -K ${KEY_PASSWORD} -A o -g 0x000B \
+ tpm2_createprimary -P ${O_PASSWORD} -K ${KEY_PASSWORD} -H o -g 0x000B \
-G 0x0001 -T device -V -C PrimaryKeyBlob
if [ $? -ne 0 ]; then echo; echo -e "${RED}Error, Exit.";
@@ -59,4 +59,4 @@ if [ $? -ne 0 ]; then echo; echo -e "${YELLOW} Primary Key does not exist, creat
rm -f PrimaryKeyBlob
fi
-#END \ No newline at end of file
+#END
diff --git a/bin/abrmdcontainer/run_abrmd.sh b/bin/abrmdcontainer/run_abrmd.sh
index 00fbf24..c4a492c 100755
--- a/bin/abrmdcontainer/run_abrmd.sh
+++ b/bin/abrmdcontainer/run_abrmd.sh
@@ -10,7 +10,7 @@ sleep 1m
# Start Resource Manager
if [ -z $TPM_SIMULATOR ]; then
echo "Using TPM Hardware for the operations";
- tpm2-abrmd
+ tpm2-abrmd --allow-root
else
echo "Using TPM Simulator for the opeations";
hostip=$(ip route show | awk '/default/ {print $3}');