minor improvements

diff --git a/fai/config/distro-install-common/install-mainline-kernel-debs b/fai/config/distro-install-common/install-mainline-kernel-debs
index 93f7c579dcc2fd325977c5bc334e020c1387e3b9..aaee5eb825c4e00b64772af1ec7d9ced2e633075 100755 (executable)
--- a/fai/config/distro-install-common/install-mainline-kernel-debs
+++ b/fai/config/distro-install-common/install-mainline-kernel-debs
@@ -82,6 +82,6 @@ for p in ${pkgs[@]}; do
   fi
 done
 if (( ${#urls[@]} >= 1 )); then
-  wget -nv "${urls[@]}"
+  wget -nv -- "${urls[@]}"
   $ROOTCMD dpkg -i ${pkgs[@]/#/$tmpdir/}
 fi

diff --git a/fai/config/scripts/IANK/11-iank b/fai/config/scripts/IANK/11-iank
index d7a5bd3e942b5abfb28eb78fd2888ff1c267002b..25c0503781e352e9de0d5515a5a7ae599ddcb7dc 100755 (executable)
--- a/fai/config/scripts/IANK/11-iank
+++ b/fai/config/scripts/IANK/11-iank
@@ -211,7 +211,7 @@ EOF
     # for running from fai or remote connections, don't kill the internet
     ethusb_arg=-c
   fi
-  if [[ $(dig +short @10.2.0.1 -x 10.2.0.2 2>&1 ||:) == kd.b8.nz. ]] \
+  if [[ $(timeout 1 dig +short @10.2.0.1 -x 10.2.0.2 2>&1 ||:) == kd.b8.nz. ]] \
        && ip n show 10.2.0.1 | grep . &>/dev/null; then
     # we are at_home
     $FAI/distro-install-common/ethusb-static $ethusb_arg