Merge pull request nix-community#152 from nix-community/raw-efi-boot

raw-efi-boot fixes
wfranzini · Apr 26, 2022 · 3cdf22c · 3cdf22c
2 parents 3cc7d08 + 8fa0a1f
commit 3cdf22c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/formats/raw-efi.nix b/formats/raw-efi.nix
@@ -8,7 +8,12 @@
     efiInstallAsRemovable = true;
   };
 
-  system.build.raw = lib.mkOverride 999 (import "${toString modulesPath}/../lib/make-disk-image.nix" {
+  fileSystems."/boot" = {
+    device = "/dev/vda1";
+    fsType = "vfat";
+  };
+
+  system.build.raw = lib.mkOverride 99 (import "${toString modulesPath}/../lib/make-disk-image.nix" {
     inherit lib config pkgs;
     partitionTableType = "efi";
     diskSize = "auto";

diff --git a/formats/vm-nogui.nix b/formats/vm-nogui.nix
@@ -8,7 +8,7 @@ let
       IFS=';t' read -r _ rows cols _ < /dev/tty
       stty "$old"
       stty cols "$cols" rows "$rows"
-    ]
+    fi
   ''; # https://unix.stackexchange.com/questions/16578/resizable-serial-console-window
 in {
   imports = [