nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-09-19 02:27:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

add pkgs.parted where partprobe is needed

Browse Source
This commit is contained in:
lassulus 2023-09-12 11:31:25 +02:00 committed by mergify[bot]
parent 7304727801
commit 79785c1cfc
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/make-disk-image.nix
View File

@ -18,9 +18,10 @@ let
bash bash
coreutils coreutils
gnused gnused
parted # for partprobe
systemdMinimal systemdMinimal
nix nix
utillinux util-linux
]; ];
preVM = '' preVM = ''
${lib.concatMapStringsSep "\n" (disk: "truncate -s ${disk.imageSize} ${disk.name}.raw") (lib.attrValues nixosConfig.config.disko.devices.disk)} ${lib.concatMapStringsSep "\n" (disk: "truncate -s ${disk.imageSize} ${disk.name}.raw") (lib.attrValues nixosConfig.config.disko.devices.disk)}

6
lib/types/gpt.nix
View File

@ -146,7 +146,11 @@ in
readOnly = true; readOnly = true;
type = lib.types.functionTo (lib.types.listOf lib.types.package); type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: default = pkgs:
[ pkgs.gptfdisk pkgs.systemdMinimal ] ++ lib.flatten (map [
pkgs.gptfdisk
pkgs.systemdMinimal
pkgs.parted # for partprobe
] ++ lib.flatten (map
(partition: (partition:
lib.optional (partition.content != null) (partition.content._pkgs pkgs) lib.optional (partition.content != null) (partition.content._pkgs pkgs)
) )

4
lib/types/mdadm.nix
View File

@ -74,7 +74,9 @@
internal = true; internal = true;
readOnly = true; readOnly = true;
type = lib.types.functionTo (lib.types.listOf lib.types.package); type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: (lib.optionals (config.content != null) (config.content._pkgs pkgs)); default = pkgs: [
pkgs.parted # for partprobe
] ++ (lib.optionals (config.content != null) (config.content._pkgs pkgs));
description = "Packages"; description = "Packages";
}; };
}; };

5
lib/types/zfs_volume.nix
View File

@ -72,7 +72,10 @@
internal = true; internal = true;
readOnly = true; readOnly = true;
type = lib.types.functionTo (lib.types.listOf lib.types.package); type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: [ pkgs.util-linux ] ++ lib.optionals (config.content != null) (config.content._pkgs pkgs); default = pkgs: [
pkgs.util-linux
pkgs.parted # for partprobe
] ++ lib.optionals (config.content != null) (config.content._pkgs pkgs);
description = "Packages"; description = "Packages";
}; };
}; };