From 417ad31ca5c149ff85bd5a4f61c81253e4906b65 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 25 Nov 2022 08:38:05 +0100 Subject: types: fix negative relative disk size --- types.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'types.nix') 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 -- cgit v1.2.3