Fixed a small bug that could cause issues on a multi-user machine where
more than one user is creating and running test installers and another
wants to run a production installer. Only one user per machine can run
the production installer at any one time.
Change-Id: I7dbbb1e63fa440988544098acc5bffdd737851b9
diff --git a/install/CreateInstaller.sh b/install/CreateInstaller.sh
index b9ae71a..14244f4 100755
--- a/install/CreateInstaller.sh
+++ b/install/CreateInstaller.sh
@@ -122,7 +122,7 @@
# which serve as documentation.
sed -i -e '/^#/!d' install.cfg
# Set the insecure registry configuration based on the installer hostname
- echo -e "${lBlue}Set up the inescure registry config for hostname ${lCyan}vinstall${uId}${NC}"
+ echo -e "${lBlue}Set up the inescure registry config for hostname ${lCyan}vinstall${NC}"
sed -i -e '/docker_push_registry/s/.*/docker_push_registry: "vinstall:5000"/' ansible/group_vars/all
echo '{' > ansible/roles/voltha/templates/daemon.json
echo '"insecure-registries" : ["vinstall:5000"]' >> ansible/roles/voltha/templates/daemon.json
@@ -139,12 +139,12 @@
do
echo "Waiting for $iVmName to shut down"
sleep 2
- vStat=`virsh list | grep $iVmName`
+ vStat=`virsh list | grep "$iVmName "`
ctr=`expr $ctr + 1`
if [ $ctr -eq $shutdownTimeout ]; then
echo -e "${red}Tired of waiting, forcing the VM off${NC}"
virsh destroy $iVmName
- vStat=`virsh list | grep $iVmName`
+ vStat=`virsh list | grep "$iVmName "`
fi
done
@@ -368,12 +368,12 @@
do
echo "Waiting for $iVmName to shut down"
sleep 2
- vStat=`virsh list | grep $iVmName`
+ vStat=`virsh list | grep "$iVmName "`
ctr=`expr $ctr + 1`
if [ $ctr -eq $shutdownTimeout ]; then
echo -e "${red}Tired of waiting, forcing the VM off${NC}"
virsh destroy $iVmName
- vStat=`virsh list | grep $iVmName`
+ vStat=`virsh list | grep "$iVmName "`
fi
done
# Copy the install bootstrap script to the installer directory