From 05afe04edbe4c28f2170194d226821c1e755ee2d Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 28 Feb 2017 11:35:35 -0500 Subject: tools/ds-identify: disable vmware_guest_customization by default. ovf_vmware_guest_customization defaults to true in cloud-init, meaning that such customization is disabled. We just missed a return value causing ovf_vmware_guest_customization to effectively default to on. Also, when looking for setting look at /etc/cloud/cloud.cfg. This had been omitted in interest of performance, but we should be looking there. --- tools/ds-identify | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools/ds-identify') diff --git a/tools/ds-identify b/tools/ds-identify index 34bf0643..e618963b 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -574,16 +574,17 @@ ovf_vmware_guest_customization() { done [ -n "$found" ] || return 1 - # disable_vmware_customization defaults to False. - # any value then other than false means disabled. + # vmware customization is disabled by default + # (disable_vmware_customization=true). If it is set to false, then + # user has requested customization. local key="disable_vmware_customization" local match="" bp="${PATH_CLOUD_CONFD}/cloud.cfg" - match="$bp.d/*[Oo][Vv][Ff]*.cfg" + match="$bp $bp.d/*[Oo][Vv][Ff]*.cfg" if check_config "$key" "$match"; then debug 2 "${_RET_fname} set $key to $_RET" case "$_RET" in 0|false|False) return 0;; - *) return;; + *) return 1;; esac fi -- cgit v1.2.3