From 071306e76a7d1a05d0ffa4251a466c3d300e268d Mon Sep 17 00:00:00 2001 From: Dylan Madisetti Date: Mon, 26 Aug 2024 14:13:07 -0400 Subject: [PATCH] tidy: apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- lib/types/zpool.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/types/zpool.nix b/lib/types/zpool.nix index 2ddbb0e..0510b94 100644 --- a/lib/types/zpool.nix +++ b/lib/types/zpool.nix @@ -135,16 +135,16 @@ in inherit config options; default = let - formatOutput = (mode: members: '' + formatOutput = mode: members: '' entries+=("${mode}=${ lib.concatMapStringsSep " " (d: if lib.strings.hasPrefix "/" d then d else "/dev/disk/by-partlabel/disk-${d}-zfs") members }") - ''); - formatVdev = (vdev: formatOutput vdev.mode vdev.members); + ''; + formatVdev = vdev: formatOutput vdev.mode vdev.members; hasTopology = !(builtins.isString config.mode); - mode = if !hasTopology then config.mode else "prescribed"; - topology = if hasTopology then config.mode.topology else { }; + mode = if hasTopology then "prescribed" else config.mode; + topology = lib.optionalAttrs hasTopology config.mode.topology; in '' readarray -t zfs_devices < <(cat "$disko_devices_dir"/zfs_${config.name})