From: Ian Kelling Date: Thu, 13 Jun 2024 00:49:42 +0000 (-0400) Subject: minor improvements X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=12c804a0a2c9e823b2579eb0a6c16acf3e82eef6;p=automated-distro-installer 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 93f7c57..aaee5eb 100755 --- 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 d7a5bd3..25c0503 100755 --- 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