Merge #46

46: handle error case better when facts return no results back r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>

Author: bors[bot]

bors.toml

@@ -1,14 +1,12 @@
 cut_body_after = "" # don't include text from the PR body in the merge commit message
 status = [
- # garnix
- "Evaluate flake.nix",
- "package docs [x86_64-linux]",
- "check from-nixos [x86_64-linux]",
- "package default [x86_64-linux]",
- "check from-nixos-with-sudo [x86_64-linux]",
- "package nixos-remote [x86_64-linux]",
- "check treefmt [x86_64-linux]",
- "package treefmt [x86_64-linux]",
- # github actions
- "deploy"
+  "Evaluate flake.nix",
+  "check from-nixos [x86_64-linux]",
+  "check from-nixos-with-sudo [x86_64-linux]",
+  "check treefmt [x86_64-linux]",
+  "deploy",
+  "devShell default [x86_64-linux]",
+  "package default [x86_64-linux]",
+  "package docs [x86_64-linux]",
+  "package nixos-remote [x86_64-linux]"
 ]

flake.lock

@@ -2,7 +2,7 @@
   description = "A universal nixos installer, just needs ssh access to the target system";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
     flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; };
     disko = { url = "github:nix-community/disko/master"; inputs.nixpkgs.follows = "nixpkgs"; };
     # used for testing

flake.nix

@@ -108,7 +108,7 @@ while [[ $# -gt 0 ]]; do
     ;;
 
   *)
-    if [[ -z ${ssh_connection:-} ]]; then
+    if [[ -z ${ssh_connection-} ]]; then
       ssh_connection="$1"
     else
       showUsage
@@ -144,24 +144,24 @@ nix_build() {
     "$@"
 }
 
-if [[ -z ${ssh_connection:-} ]]; then
+if [[ -z ${ssh_connection-} ]]; then
   abort "ssh-host must be set"
 fi
 
 # parse flake nixos-install style syntax, get the system attr
-if [[ -n ${flake:-} ]]; then
+if [[ -n ${flake-} ]]; then
   if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then
     flake="${BASH_REMATCH[1]}"
     flakeAttr="${BASH_REMATCH[2]}"
   fi
-  if [[ -z ${flakeAttr:-} ]]; then
+  if [[ -z ${flakeAttr-} ]]; then
     echo "Please specify the name of the NixOS configuration to be installed, as a URI fragment in the flake-uri."
     echo 'For example, to use the output nixosConfigurations.foo from the flake.nix, append "#foo" to the flake-uri.'
     exit 1
   fi
   disko_script=$(nix_build "${flake}#nixosConfigurations.${flakeAttr}.config.system.build.disko")
   nixos_system=$(nix_build "${flake}#nixosConfigurations.${flakeAttr}.config.system.build.toplevel")
-elif [[ -n ${disko_script:-} ]] && [[ -n ${nixos_system:-} ]]; then
+elif [[ -n ${disko_script-} ]] && [[ -n ${nixos_system-} ]]; then
   if [[ ! -e ${disko_script} ]] || [[ ! -e ${nixos_system} ]]; then
     echo "${disko_script} and ${nixos_system} must be existing store-paths"
     exit 1
@@ -171,12 +171,10 @@ else
   abort "flake must be set"
 fi
 
-# wait for machine to become reachable (possibly forever)
-# TODO we probably need an architecture detection here
-# TODO if we have specified a user here but we are already booted into the
-# installer, than the user might not work anymore
-until facts=$(
-  ssh_ -o ConnectTimeout=10 -- <<SSH
+import_facts() {
+  local facts filtered_facts
+  if ! facts=$(
+    ssh_ -o ConnectTimeout=10 -- <<SSH
 set -efu ${enable_debug}
 has(){
   command -v "\$1" >/dev/null && echo "y" || echo "n"
@@ -194,14 +192,23 @@ has_wget=\$(has wget)
 has_curl=\$(has curl)
 FACTS
 SSH
-); do
+  ); then
+    return 1
+  fi
+  filtered_facts=$(echo "$facts" | grep -E '^(has|is)_[a-z0-9_]+=\S+')
+  if [[ -z $filtered_facts ]]; then
+    abort "Retrieving host facts via ssh failed. Check with --debug for the root cause, unless you have done so already"
+  fi
+  # make facts available in script
+  # shellcheck disable=SC2046
+  export $(echo "$filtered_facts" | xargs)
+}
+
+# wait for machine to become reachable (possibly forever)
+until import_facts; do
   sleep 5
 done
 
-# make facts available in script
-# shellcheck disable=SC2046
-export $(echo "$facts" | grep -E '^(has|is)_[a-z0-9_]+=\S+' | xargs)
-
 if [[ ${has_tar-n} == "n" ]]; then
   abort "no tar command found, but required to unpack kexec tarball"
 fi
@@ -264,7 +271,7 @@ if [[ ${stop_after_disko-n} == "y" ]]; then
 fi
 
 nix_copy --to "ssh://$ssh_connection?remote-store=local?root=/mnt" "$nixos_system"
-if [[ -n ${extra_files:-} ]]; then
+if [[ -n ${extra_files-} ]]; then
   if [[ -d $extra_files ]]; then
     extra_files="$extra_files/"
   fi