summaryrefslogtreecommitdiffstats
path: root/types.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-11-25 08:38:05 +0100
committerlassulus <lassulus@lassul.us>2022-11-25 08:38:47 +0100
commit417ad31ca5c149ff85bd5a4f61c81253e4906b65 (patch)
tree2e377dbebdaad9cfc023fad9cd1584faa516031b /types.nix
parent1668efc14a56f126cd4aaa3fc2569120e962c2a9 (diff)
types: fix negative relative disk size
Diffstat (limited to 'types.nix')
-rw-r--r--types.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/types.nix b/types.nix
index d4d6256..e09ca9d 100644
--- a/types.nix
+++ b/types.nix
@@ -394,7 +394,7 @@ rec {
readOnly = true;
type = types.functionTo types.str;
default = dev: ''
- parted -s ${dev} mklabel ${config.format}
+ parted -s ${dev} -- mklabel ${config.format}
${concatMapStrings (partition: partition._create dev config.format) config.partitions}
'';
};
@@ -480,18 +480,18 @@ rec {
type = types.functionTo (types.functionTo types.str);
default = dev: type: ''
${optionalString (type == "gpt") ''
- parted -s ${dev} mkpart ${config.name} ${diskoLib.maybeStr config.fs-type} ${config.start} ${config.end}
+ parted -s ${dev} -- mkpart ${config.name} ${diskoLib.maybeStr config.fs-type} ${config.start} ${config.end}
''}
${optionalString (type == "msdos") ''
- parted -s ${dev} mkpart ${config.part-type} ${diskoLib.maybeStr config.fs-type} ${diskoLib.maybeStr config.fs-type} ${config.start} ${config.end}
+ parted -s ${dev} -- mkpart ${config.part-type} ${diskoLib.maybeStr config.fs-type} ${diskoLib.maybeStr config.fs-type} ${config.start} ${config.end}
''}
# ensure /dev/disk/by-path/..-partN exists before continuing
udevadm trigger --subsystem-match=block; udevadm settle
${optionalString (config.bootable) ''
- parted -s ${dev} set ${toString config.index} boot on
+ parted -s ${dev} -- set ${toString config.index} boot on
''}
${concatMapStringsSep "" (flag: ''
- parted -s ${dev} set ${toString config.index} ${flag} on
+ parted -s ${dev} -- set ${toString config.index} ${flag} on
'') config.flags}
# ensure further operations can detect new partitions
udevadm trigger --subsystem-match=block; udevadm settle