Define CONFIG_DRIVE_LABEL in default case

glean.sh runs with set -eu which will cause an error if a variable is
undefined. When not using config drive and not getting a match the
variable CONFIG_DRIVE_LABEL is unset and so the -n test will fail
meaning that glean won't start and our VMs don't get network access on
boot.

Change-Id: I5fa6ce1c4a0b7218475ad5e8983df7be4ab174f4
Signed-off-by: Jamie Lennox <jamielennox@gmail.com>
This commit is contained in:
Jamie Lennox 2017-08-17 16:41:48 +10:00
parent 0b3e21f3bc
commit 9344ac6876
1 changed files with 2 additions and 0 deletions

View File

@ -42,6 +42,8 @@ function config_exists() {
# NOTE(mnaser): Depending on the cloud, it may have `vfat` config drive which
# comes with a capitalized label rather than all lowercase.
CONFIG_DRIVE_LABEL=""
if blkid -t LABEL="config-2" ; then
CONFIG_DRIVE_LABEL="config-2"
elif blkid -t LABEL="CONFIG-2" ; then