From 65a2c87a7c421176c9487238c1c20fce907aab0a Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Mon, 5 Dec 2016 12:16:27 +0800
Subject: [PATCH] fixes: root password contains special characters

---
 tools/ova/script/config.sh           | 2 +-
 tools/ova/script/firstboot.sh        | 2 +-
 tools/ova/script/firstboot_config.sh | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/ova/script/config.sh b/tools/ova/script/config.sh
index 957a9a7da..ad6bb7979 100755
--- a/tools/ova/script/config.sh
+++ b/tools/ova/script/config.sh
@@ -157,7 +157,7 @@ fi
 if [ -n "$hostname" ]
 then
 	echo "Hostname: $hostname"
-	configureHarborCfg hostname $hostname
+	configureHarborCfg "hostname" "$hostname"
 else
 	echo "Failed to get the hostname"
 	exit 1
diff --git a/tools/ova/script/firstboot.sh b/tools/ova/script/firstboot.sh
index 87439b873..c14ebd87b 100755
--- a/tools/ova/script/firstboot.sh
+++ b/tools/ova/script/firstboot.sh
@@ -13,7 +13,7 @@ value=$(ovfenv -k root_pwd)
 if [ -n "$value" ]
 then
 	echo "Resetting root password..."
-	printf "$value\n$value\n" | passwd root
+	printf "%s\n%s\n" "$value" "$value" | passwd root
 fi
 
 #configure SSH
diff --git a/tools/ova/script/firstboot_config.sh b/tools/ova/script/firstboot_config.sh
index e694ebbdd..272c1e5ec 100755
--- a/tools/ova/script/firstboot_config.sh
+++ b/tools/ova/script/firstboot_config.sh
@@ -9,7 +9,7 @@ echo "Read attribute using ovfenv: [ auth_mode ]"
 auth_mode=$(ovfenv -k auth_mode)
 if [ -n "$auth_mode" ]
 then
-	configureHarborCfg auth_mode $auth_mode
+	configureHarborCfg "auth_mode" "$auth_mode"
 fi
 
 #Configure password of Harbor administrator 
@@ -17,7 +17,7 @@ echo "Read attribute using ovfenv: [ harbor_admin_password ]"
 adm_pwd=$(ovfenv -k harbor_admin_password)
 if [ -n "$adm_pwd" ]
 then
-	configureHarborCfg harbor_admin_password $adm_pwd
+	configureHarborCfg "harbor_admin_password" "$adm_pwd"
 fi
 
 #Configure password of database 
@@ -25,7 +25,7 @@ echo "Read attribute using ovfenv: [ db_password ]"
 db_pwd=$(ovfenv -k db_password)
 if [ -n "$db_pwd" ]
 then
-	configureHarborCfg db_password $db_pwd
+	configureHarborCfg "db_password" "$db_pwd"
 fi
 
 #Configure other attrs