← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~smoser/cloud-init:bug/1674766-ds-identify-bigstep into cloud-init:master


Scott Moser has proposed merging ~smoser/cloud-init:bug/1674766-ds-identify-bigstep into cloud-init:master.

Commit message:
ds-identify: fix detection of Bigstep datasource.

The path for checking presence of Bigstep datasource was simply wrong.
Set the correct path.

LP: #1674766

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1674766 in cloud-init: "ds-identify for Bigstep datasource checks wrong file"

For more details, see:
Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/1674766-ds-identify-bigstep into cloud-init:master.
diff --git a/tools/ds-identify b/tools/ds-identify
index 6f1e983..b3220c1 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -633,7 +633,8 @@ dscheck_Azure() {
 dscheck_Bigstep() {
     # bigstep is activated by presense of seed file 'url'
-    check_seed_dir "bigstep" url && return ${DS_FOUND}
+    [ -f "${PATH_VAR_LIB_CLOUD}/data/seed/bigstep/url" ] &&
+        return ${DS_FOUND}
     return ${DS_NOT_FOUND}