Merge #94

94: bash is no longer required r=Mic92 a=Mic92



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

Author: bors[bot]

flake.lock

@@ -7,8 +7,10 @@
     disko = { url = "github:nix-community/disko/master"; inputs.nixpkgs.follows = "nixpkgs"; };
     # used for testing
     nixos-images.url = "github:nix-community/nixos-images";
+    nixos-images.inputs.nixos-2211.follows = "";
+    nixos-images.inputs.nixos-unstable.follows = "nixpkgs";
     # used for development
-    treefmt-nix.url = "github:numtide/treefmt-nix";
+    treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
   };
 
 

flake.nix

@@ -235,7 +235,6 @@ has_sudo=\$(has sudo)
 has_wget=\$(has wget)
 has_curl=\$(has curl)
 has_setsid=\$(has setsid)
-has_bash=\$(has bash)
 FACTS
 SSH
   ); then
@@ -256,10 +255,6 @@ if [[ ${has_tar-n} == "n" ]]; then
   abort "no tar command found, but required to unpack kexec tarball"
 fi
 
-if [[ ${has_bash-n} == "n" ]]; then
-  abort "no bash command found, but required for running the reboot script"
-fi
-
 if [[ ${has_setsid-n} == "n" ]]; then
   abort "no setsid command found, but required to run the kexec script under a new session"
 fi

src/nixos-anywhere.sh

@@ -30,7 +30,11 @@
         --store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
         root@installed >&2
     """)
-    installed.shutdown()
+    try:
+      installed.shutdown()
+    except BrokenPipeError:
+      # qemu has already exited
+      pass
     new_machine = create_test_machine(oldmachine=installed, args={ "name": "after_install" })
     new_machine.start()
     hostname = new_machine.succeed("hostname").strip()

tests/from-nixos.nix

@@ -21,14 +21,12 @@
           partitions = [
             {
               name = "boot";
-              type = "partition";
               start = "0";
               end = "1M";
               part-type = "primary";
               flags = [ "bios_grub" ];
             }
             {
-              type = "partition";
               name = "ESP";
               start = "1MiB";
               end = "100MiB";
@@ -41,7 +39,6 @@
             }
             {
               name = "root";
-              type = "partition";
               start = "100MiB";
               end = "100%";
               part-type = "primary";