cloud-init-dev team mailing list archive

[Chris Brinker <chris.brinker@xxxxxxxxx>]

Chris Brinker has proposed merging ~chris-brinker/cloud-init:actually-skip-warnings into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~chris-brinker/cloud-init/+git/cloud-init/+merge/323406

This change allows the presence of "/var/lib/cloud/instance/warnings/.skip" to actually skip warnings as documented.
-- 
Your team cloud init development team is requested to review the proposed merge of ~chris-brinker/cloud-init:actually-skip-warnings into cloud-init:master.

diff --git a/tools/Z99-cloudinit-warnings.sh b/tools/Z99-cloudinit-warnings.sh
index b237786..1d41337 100644
--- a/tools/Z99-cloudinit-warnings.sh
+++ b/tools/Z99-cloudinit-warnings.sh
@@ -4,12 +4,12 @@
 # Purpose: show user warnings on login.
 
 cloud_init_warnings() {
-    local skipf="" warning="" idir="/var/lib/cloud/instance" n=0
+    local warning="" idir="/var/lib/cloud/instance" n=0
     local warndir="$idir/warnings"
     local ufile="$HOME/.cloud-warnings.skip" sfile="$warndir/.skip"
     [ -d "$warndir" ] || return 0
     [ ! -f "$ufile" ] || return 0
-    [ ! -f "$skipf" ] || return 0
+    [ ! -f "$sfile" ] || return 0
 
     for warning in "$warndir"/*; do
         [ -f "$warning" ] || continue