Wait for internet connection before starting the setup
This commit is contained in:
parent
fb3a89f4b8
commit
5cfb4ee184
2 changed files with 54 additions and 1 deletions
|
@ -3,6 +3,7 @@ begin
|
||||||
set -l dir (status dirname)
|
set -l dir (status dirname)
|
||||||
source "$dir/../../Common/Scripts/config.fish"
|
source "$dir/../../Common/Scripts/config.fish"
|
||||||
source "$dir/../../Common/Scripts/hooks.fish"
|
source "$dir/../../Common/Scripts/hooks.fish"
|
||||||
|
source "$dir/../../Common/Scripts/wait-network.fish"
|
||||||
|
|
||||||
set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix"
|
set -q CONFIG_MODULE || set -l CONFIG_MODULE "$dir/config.nix"
|
||||||
|
|
||||||
|
@ -11,7 +12,9 @@ begin
|
||||||
set -q USER_NAME || set -l USER_NAME manuel
|
set -q USER_NAME || set -l USER_NAME manuel
|
||||||
set -q USER_DISPLAYNAME
|
set -q USER_DISPLAYNAME
|
||||||
set -q USER_GROUPS || set -l USER_GROUPS ""
|
set -q USER_GROUPS || set -l USER_GROUPS ""
|
||||||
begin
|
|
||||||
|
waitNetwork
|
||||||
|
and begin
|
||||||
set -l projectRoot (realpath "$dir/../../..")
|
set -l projectRoot (realpath "$dir/../../..")
|
||||||
set -l projectName (basename "$projectRoot")
|
set -l projectName (basename "$projectRoot")
|
||||||
set -l relativeDir (realpath --relative-to "$projectRoot" "$dir")
|
set -l relativeDir (realpath --relative-to "$projectRoot" "$dir")
|
||||||
|
|
50
scripts/Common/Scripts/wait-network.fish
Normal file
50
scripts/Common/Scripts/wait-network.fish
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
#!/bin/env fish
|
||||||
|
function waitNetwork -a witness
|
||||||
|
set -l timeout (math 10 \* 60)
|
||||||
|
set -l codeFile (mktemp)
|
||||||
|
|
||||||
|
if [ -z "$witness" ]
|
||||||
|
tmux new-session -d 'cat /etc/motd; echo "$(tput bold)Please establish an internet connection…$(tput sgr0)"; $SHELL'
|
||||||
|
|
||||||
|
if not systemctl --quiet is-active network-online.target
|
||||||
|
fish (status filename) true &
|
||||||
|
set -l pid "$last_pid"
|
||||||
|
|
||||||
|
function witnessHandler -V codeFile --on-process-exit "$pid" -a event pid code
|
||||||
|
echo "$code" > "$codeFile"
|
||||||
|
|
||||||
|
if [ "$code" -gt 0 ]
|
||||||
|
echo "Unable to connect to the internet!"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
tmux attach
|
||||||
|
wait "$pid"
|
||||||
|
return "$(cat "$codeFile")"
|
||||||
|
end
|
||||||
|
else
|
||||||
|
set -l x 0
|
||||||
|
|
||||||
|
while true
|
||||||
|
set x (math $x + 1)
|
||||||
|
|
||||||
|
if systemctl --quiet is-active network-online.target
|
||||||
|
tmux kill-session &> /dev/null
|
||||||
|
break
|
||||||
|
else
|
||||||
|
not tmux list-sessions &> /dev/null
|
||||||
|
or test "$x" -gt 10
|
||||||
|
and begin
|
||||||
|
tmux kill-session &> /dev/null
|
||||||
|
exit 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if [ -n "$argv" ]
|
||||||
|
waitNetwork $argv
|
||||||
|
end
|
Loading…
Reference in a new issue