X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=autoconfig.functions;h=2736153fdc2f34069e63cb2afc088b3f5b8718c1;hb=9675531f6834edea731b5bd7d434bd544df02a74;hp=06265e8de32e3a859e575e511745d0fe81ec3c0a;hpb=12e47aed34dc3c59822af79dfec0a93fec810e00;p=grml-autoconfig.git

diff --git a/autoconfig.functions b/autoconfig.functions
index 06265e8..2736153 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -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
 
@@ -1570,6 +1570,7 @@ DCSMP="/mnt/grml"
 GRMLCFG="$(getbootparam 'autoconfig' 2>>$DEBUG)"
 [ -n "$GRMLCFG" ] || GRMLCFG="GRMLCFG"
 if checkbootparam 'noautoconfig' || checkbootparam 'forensic' ; then
+  DCSDIR="/live/image" # set default so it works for "scripts" boot option as expected
   ewarn "Skipping running automount of device(s) labeled $GRMLCFG as requested." ; eend 0
 else
   if [ -z "$INSTALLED" ] ; then
@@ -1703,7 +1704,7 @@ if checkbootparam 'scripts' || [ "$DCSMP" = "/mnt/grmlcfg" ]; then
        sh -c $SCRIPTS
      elif [ -d "$SCRIPTS" ]; then
        einfo "Bootparameter scripts found. Trying to execute from directory ${SCRIPTS}:"
-       run-parts $SCRIPTS
+       run-parts --regex '.*' $SCRIPTS
      else
        einfo "Bootparameter scripts found. Trying to execute ${SCRIPTS}:"
        sh -c $SCRIPTS