Merge ~otubo/cloud-init:covscan-issues into cloud-init:master

[Eduardo Otubo]

These are small changes caught by covscan that should be fixed with low priority.

[Scott Moser (smoser)]

thoughts?

I do appreciate the static code analysis, but I do not think its correct in any of these cases.

review: Needs Information

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:82284e2e93c8f0967860453377824f898621ff2f
https://jenkins.ubuntu.com/server/job/cloud-init-ci/519/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/519/rebuild

review: Needs Fixing (continuous-integration)

Unmerged commits

82284e2... by Eduardo Otubo on 2018-10-08

Fixing static code issues found by covscan

A covscan run on cloud-init found these issues that could be quickly
fixed:

1) unecessary join function used:

  cloudinit/config/cc_lxd.py:
  - log.debug("Creating lxd bridge: %s" %
  - " ".join(cmd_create))
  + log.debug("Creating lxd bridge: %s " %
  + cmd_create)

2) Unused variables:

  tools/uncloud-init:
  - helpmount) helpmount=1;;
  - root=*) rootspec=${x#root=};;

  tools/write-ssh-key-fingerprints:
  - read ktype line < "$f"
  + read ktype < "$f"

Signed-off-by: Eduardo Otubo <email address hidden>

diff --git a/cloudinit/config/cc_lxd.py b/cloudinit/config/cc_lxd.py
index 24a8ebe..90c1f12 100644
--- a/cloudinit/config/cc_lxd.py
+++ b/cloudinit/config/cc_lxd.py
@@ -146,13 +146,11 @@ def handle(name, cfg, cloud, log, args):
                 net_name=net_name, did_init=bool(init_cfg),
                 create=bool(cmd_create), attach=bool(cmd_attach))
             if cmd_create:
-                log.debug("Creating lxd bridge: %s" %
-                          " ".join(cmd_create))
+                log.debug("Creating lxd bridge: %s " % cmd_create)
                 _lxc(cmd_create)
 
             if cmd_attach:
-                log.debug("Setting up default lxd bridge: %s" %
-                          " ".join(cmd_create))
+                log.debug("Setting up default lxd bridge: %s" % cmd_create)
                 _lxc(cmd_attach)
 
     elif bridge_cfg:
diff --git a/tools/uncloud-init b/tools/uncloud-init
index 217371c..d565845 100755
--- a/tools/uncloud-init
+++ b/tools/uncloud-init
@@ -97,8 +97,6 @@ for x in ${cmdline}; do
 			log "end update  ${dev},${fmt}"
 			;;
 		ubuntu-pass=*|ubuntu_pass=*) ubuntu_pass=${x#*=};;
-		helpmount) helpmount=1;;
-		root=*) rootspec=${x#root=};;
 	esac
 done
 
diff --git a/tools/write-ssh-key-fingerprints b/tools/write-ssh-key-fingerprints
index 2a3dca7..f748259 100755
--- a/tools/write-ssh-key-fingerprints
+++ b/tools/write-ssh-key-fingerprints
@@ -18,7 +18,7 @@ echo "#############################################################"
 echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----"
 for f in /etc/ssh/ssh_host_*key.pub; do
     [ -f "$f" ] || continue
-    read ktype line < "$f"
+    read ktype < "$f"
     # skip the key if its type is in the blacklist
     [ "${fp_blist#*,$ktype,}" = "${fp_blist}" ] || continue
     ssh-keygen -l -f "$f"
@@ -31,7 +31,7 @@ echo "#############################################################"
 echo "-----BEGIN SSH HOST KEY KEYS-----"
 for f in /etc/ssh/ssh_host_*key.pub; do
     [ -f "$f" ] || continue
-    read ktype line < "$f"
+    read ktype < "$f"
     # skip the key if its type is in the blacklist
     [ "${key_blist#*,$ktype,}" = "${key_blist}" ] || continue
     cat $f