CMDLINE handling: do not use 'local' outside a function

[grml-autoconfig.git] / autoconfig.functions

diff --git a/autoconfig.functions b/autoconfig.functions
index 19e7459..0e962c5 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -42,9 +42,9 @@ if [ -z "$CMDLINE" ]; then
   [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/* | tr '\n' ' ')"
   modprobe 9p 2>/dev/null || true
   if grep -q 9p /proc/filesystems ; then
-      local TAG="grml-parameters"
+      TAG="grml-parameters"
       if grep -q "$TAG" /sys/bus/virtio/devices/*/mount_tag 2>/dev/null ; then
-          local MOUNTDIR="$(mktemp -d)"
+          MOUNTDIR="$(mktemp -d)"
           mount -t 9p -o trans=virtio,ro "$TAG" "$MOUNTDIR"
           CMDLINE="$CMDLINE $(cat "$MOUNTDIR"/* 2>/dev/null | tr '\n' ' ')"
           umount "$MOUNTDIR"
@@ -1126,7 +1126,7 @@ fi
 
 # {{{ display hostkeys of SSH server
 config_display_ssh_fingerprints() {
-  if ! find /etc/ssh/ -name ssh_host_\*_key >/dev/null 2>&1 ; then
+  if ! ls /etc/ssh/ssh_host_\*_key >/dev/null 2>&1 ; then
     return 0 # no SSH host keys present
   fi