summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ds-identify8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/ds-identify b/tools/ds-identify
index a062e4d7..435a5bcb 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -641,9 +641,11 @@ check_configdrive_v2() {
return ${DS_FOUND}
fi
- is_ds_enabled "IBMCloud"
- debug 1 "is_ds_enabled returned $?: $DI_DSLIST"
- is_ds_enabled "IBMCloud" && is_ibm_cloud && return ${DS_NOT_FOUND}
+ local ibm_enabled=false
+ is_ds_enabled "IBMCloud" && ibm_enabled=true
+ debug 1 "is_ds_enabled(IBMCloud) = $ibm_enabled."
+ [ "$ibm_enabled" = "true" ] && is_ibm_cloud && return ${DS_NOT_FOUND}
+
if has_fs_with_label CONFIG-2 config-2; then
return ${DS_FOUND}
fi