Merge ~smoser/cloud-init:bug/1663723-ds-nocloud into cloud-init:master

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

Commit message

ds-identify: read ds=nocloud properly

The nocloud datasource specifically would look for ds=nocloud or
ds=nocloud-net (often augmented with 'seedfrom') on the kernel command line.
Fix to return DS_FOUND in that case.

LP: #1663723

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
diff --git a/tools/ds-identify b/tools/ds-identify
index 88094af..e454ed6 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -514,6 +514,9 @@ dscheck_MAAS() {
515dscheck_NoCloud() {515dscheck_NoCloud() {
516 local fslabel="cidata" d=""516 local fslabel="cidata" d=""
517 case " ${DI_KERNEL_CMDLINE} " in
518 *\ ds=nocloud*) return ${DS_FOUND};;
519 esac
517 for d in nocloud nocloud-net; do520 for d in nocloud nocloud-net; do
518 check_seed_dir "$d" meta-data user-data && return ${DS_FOUND}521 check_seed_dir "$d" meta-data user-data && return ${DS_FOUND}
519 done522 done


People subscribed via source and target branches