From 5444b34f185df8197a00a21cc32d8e8c2c075cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 12 Apr 2024 15:19:20 +0200 Subject: [PATCH 1/2] fix installer --- nixosModules/installer/default.nix | 46 ------------------------------ 1 file changed, 46 deletions(-) diff --git a/nixosModules/installer/default.nix b/nixosModules/installer/default.nix index 6e161dbbc..0fb0e5697 100644 --- a/nixosModules/installer/default.nix +++ b/nixosModules/installer/default.nix @@ -64,50 +64,4 @@ cat /var/shared/qrcode.utf8 fi ''; - - # boot.loader.systemd-boot.enable = true; - - # Grub doesn't find devices for both BIOS and UEFI? - # Mic92: Please write where this exactly breaks if you want to comment out grub again. - # NOTE: We need grub here. Otherwise, the system won't boot in some machines. - # example: Lenovo E495 didn't boot without grub. - boot.loader.grub.efiInstallAsRemovable = true; - boot.loader.grub.efiSupport = true; - - disko.devices = { - disk = { - stick = { - type = "disk"; - device = "/vda"; - imageSize = "3G"; - content = { - type = "gpt"; - partitions = { - boot = { - priority = 1; - size = "1M"; - type = "EF02"; # for grub MBR - }; - ESP = { - size = "100M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; } From 7fd456f3d42449daa0415f8fc6707a92b047612d Mon Sep 17 00:00:00 2001 From: a-kenji Date: Fri, 12 Apr 2024 15:54:04 +0200 Subject: [PATCH 2/2] installer: add zstd compression --- nixosModules/installer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixosModules/installer/default.nix b/nixosModules/installer/default.nix index 0fb0e5697..97fc385fa 100644 --- a/nixosModules/installer/default.nix +++ b/nixosModules/installer/default.nix @@ -16,6 +16,7 @@ (modulesPath + "/profiles/installation-device.nix") (modulesPath + "/profiles/all-hardware.nix") (modulesPath + "/profiles/base.nix") + (modulesPath + "/installer/cd-dvd/iso-image.nix") ]; services.openssh.settings.PermitRootLogin = "yes"; system.activationScripts.root-password = '' @@ -64,4 +65,5 @@ cat /var/shared/qrcode.utf8 fi ''; + isoImage.squashfsCompression = "zstd"; }