From 20bd192db661e519b860a0799de04c663ceae0c6 Mon Sep 17 00:00:00 2001 From: Chad Smith Date: Tue, 18 Jan 2022 20:46:14 -0700 Subject: cmd: status and cloud-id avoid change in behavior for 'not run' (#1197) snapd currrently looks for 'not run' from cloud-init status[1]. Avoid changing this behavior and revert "not-run" value to "not run". This avoids having to get snapd to change implementation and release updates as far back as Bionic to handle a hyphenated not-run string. [1]: https://github.com/snapcore/snapd/blob/master/sysconfig/\ cloudinit.go#L802 --- cloudinit/cmd/cloud_id.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cloudinit/cmd/cloud_id.py') diff --git a/cloudinit/cmd/cloud_id.py b/cloudinit/cmd/cloud_id.py index b71c19de..b9c30fb4 100755 --- a/cloudinit/cmd/cloud_id.py +++ b/cloudinit/cmd/cloud_id.py @@ -63,7 +63,7 @@ def handle_args(name, args): Print the canonical cloud-id on which the instance is running. - @return: 0 on success, 1 on error, 2 on disabled, 3 on cloud-init not-run. + @return: 0 on success, 1 on error, 2 on disabled, 3 on cloud-init not run. """ status, _status_details, _time = get_status_details() if status == UXAppStatus.DISABLED: -- cgit v1.2.3