manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make partition size nullable

Browse source
This commit is contained in:
Manuel Thalmann 2024-06-22 18:21:25 +02:00
parent a233064815
commit dc4bcb4d22
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/modules/partition.nix
View file

@ -131,7 +131,7 @@
order = mkOption {
type = types.int;
description = "The sort order of the partition creation.";
default = if (!isSwap) && ((builtins.match ".*[^[:space:]].*" config.size) == null) then 1 else 0;
default = if (!isSwap) && ((builtins.match ".*[^[:space:]].*" (toString config.size)) == null) then 1 else 0;
};
label = mkOption {
@ -147,8 +147,9 @@
};
size = mkOption {
type = types.str;
type = types.nullOr types.str;
description = "The size of the partition.";
default = null;
};
sizeScript = mkOption {
@ -170,7 +171,7 @@
then
''echo "$(cat /proc/meminfo | awk -F " " '/^MemTotal/ { print $2 }' | awk '{ print int((($1 / 1024 / 1024) * 0.75) + 0.5)}')"G''
else
"echo ${lib.strings.escapeShellArg config.size}"
"echo ${lib.strings.escapeShellArg (toString config.size)}"
);
};
}