cloud-init-dev team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging ~smoser/cloud-init:bug/1663723-ds-nocloud into cloud-init:master.

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

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1663723 in curtin: "zesty cloud-init doesn't know about ds=nocloud-net;seedfrom="
  https://bugs.launchpad.net/curtin/+bug/1663723

For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/317007
-- 
Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/1663723-ds-nocloud into cloud-init:master.

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() {
 
 dscheck_NoCloud() {
     local fslabel="cidata" d=""
+    case " ${DI_KERNEL_CMDLINE} " in
+        *\ ds=nocloud*) return ${DS_FOUND};;
+    esac
     for d in nocloud nocloud-net; do
         check_seed_dir "$d" meta-data user-data && return ${DS_FOUND}
     done