summaryrefslogtreecommitdiff
path: root/tools/ds-identify
diff options
context:
space:
mode:
Diffstat (limited to 'tools/ds-identify')
-rwxr-xr-xtools/ds-identify5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/ds-identify b/tools/ds-identify
index 5d390ef7..a40b14d4 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -552,13 +552,14 @@ check_configdrive_v2() {
# look in /config-drive <vlc>/seed/config_drive for a directory
# openstack/YYYY-MM-DD format with a file meta_data.json
local d=""
- for d in /config-drive "${PATH_VAR_LIB_CLOUD}/seed/config_drive"; do
+ local vlc_config_drive_path="${PATH_VAR_LIB_CLOUD}/seed/config_drive"
+ for d in /config-drive $vlc_config_drive_path; do
set +f; set -- "$d/openstack/"2???-??-??/meta_data.json; set -f;
[ -f "$1" ] && return ${DS_FOUND}
done
# at least one cloud (softlayer) seeds config drive with only 'latest'.
local lpath="openstack/latest/meta_data.json"
- if [ -e "${PATH_VAR_LIB_CLOUD}/$lpath" ]; then
+ if [ -e "$vlc_config_drive_path/$lpath" ]; then
debug 1 "config drive seeded directory had only 'latest'"
return ${DS_FOUND}
fi