Scott Moser has proposed merging ~smoser/cloud-init:fix/ds-identify-vmware-detection into cloud-init:master.
Commit message: ds-identify: fix wrong variable name in ovf_vmware_transport_guestinfo. ovf_vmware_transport_guestinfo is not currently tested. It used '$1' instead of '$out' when checking for xml content in the output of vmware-rpctool. Requested reviews: cloud-init commiters (cloud-init-dev) For more details, see: https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/361218 see commit message -- Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:fix/ds-identify-vmware-detection into cloud-init:master.
diff --git a/tools/ds-identify b/tools/ds-identify index c61f18a..b78b273 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -736,7 +736,7 @@ ovf_vmware_transport_guestinfo() { debug 1 "Running on vmware but rpctool query returned $ret: $out" return 1 fi - case "$1" in + case "$out" in "<?xml"*|"<?XML"*) :;; *) debug 1 "guestinfo.ovfEnv had non-xml content: $out"; return 1;;
_______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp