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

Proposed by Scott Moser
Status: Merged
Merged at revision: 20a628c122583e159782c88547128fec1983376c
Proposed branch: ~smoser/cloud-init:bug/1674766-ds-identify-bigstep
Merge into: cloud-init:master
Diff against target: 13 lines (+2/-1)
1 file modified
tools/ds-identify (+2/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email:

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

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/ds-identify b/tools/ds-identify
2index 6f1e983..b3220c1 100755
3--- a/tools/ds-identify
4+++ b/tools/ds-identify
5@@ -633,7 +633,8 @@ dscheck_Azure() {
7 dscheck_Bigstep() {
8 # bigstep is activated by presense of seed file 'url'
9- check_seed_dir "bigstep" url && return ${DS_FOUND}
10+ [ -f "${PATH_VAR_LIB_CLOUD}/data/seed/bigstep/url" ] &&
11+ return ${DS_FOUND}
12 return ${DS_NOT_FOUND}
13 }


People subscribed via source and target branches