Merge pull request #63 from DavHau/raw-improvements

add usb kernel module to raw formats; remove use of mkForce
This commit is contained in:
Lassulus 2020-07-26 20:03:10 +02:00 committed by GitHub
commit d2db6ad1dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions

View File

@ -8,7 +8,7 @@
efiInstallAsRemovable = true;
};
system.build.raw = lib.mkForce (import "${toString modulesPath}/../lib/make-disk-image.nix" {
system.build.raw = lib.mkOverride 999 (import "${toString modulesPath}/../lib/make-disk-image.nix" {
inherit lib config pkgs;
partitionTableType = "efi";
diskSize = 2048;

View File

@ -6,10 +6,13 @@
fsType = "ext4";
};
boot.growPartition = true;
boot.kernelParams = [ "console=ttyS0" ];
boot.loader.grub.device = lib.mkDefault "/dev/vda";
boot.loader.timeout = 0;
boot = {
growPartition = true;
kernelParams = [ "console=ttyS0" ];
loader.grub.device = lib.mkDefault "/dev/vda";
loader.timeout = 0;
initrd.availableKernelModules = [ "uas" ];
};
system.build.raw = import "${toString modulesPath}/../lib/make-disk-image.nix" {