technofab/disko
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/disko.git synced 2025-12-11 23:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

more quotes to make shellcheck happy

Browse source
This commit is contained in:
lassulus 2023-02-14 08:35:12 +01:00
parent 6d630b8fe4
commit 6da7333a76
6 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
types/lvm_pv.nix
View file

@ -23,7 +23,7 @@
inherit config options;
default = { dev }: ''
pvcreate ${dev}
echo "${dev}" >> $disko_devices_dir/lvm_${config.vg}
echo "${dev}" >> "$disko_devices_dir"/lvm_${config.vg}
'';
};
_mount = diskoLib.mkMountOption {

4
types/lvm_vg.nix
View file

@ -27,7 +27,9 @@
_create = diskoLib.mkCreateOption {
inherit config options;
default = _: ''
vgcreate ${config.name} $(tr '\n' ' ' < $disko_devices_dir/lvm_${config.name})
readarray -t lvm_devices < <(cat "$disko_devices_dir"/lvm_${config.name})
vgcreate ${config.name} \
"''${lvm_devices[@]}"
${lib.concatMapStrings (lv: lv._create {vg = config.name; }) (lib.attrValues config.lvs)}
'';
};

5
types/mdadm.nix
View file

@ -34,13 +34,14 @@
_create = diskoLib.mkCreateOption {
inherit config options;
default = _: ''
readarray -t disk_devices < <(cat "$disko_devices_dir"/raid_${config.name})
echo 'y' | mdadm --create /dev/md/${config.name} \
--level=${toString config.level} \
--raid-devices=$(wc -l $disko_devices_dir/raid_${config.name} | cut -f 1 -d " ") \
--raid-devices="$(wc -l "$disko_devices_dir"/raid_${config.name} | cut -f 1 -d " ")" \
--metadata=${config.metadata} \
--force \
--homehost=any \
$(tr '\n' ' ' < $disko_devices_dir/raid_${config.name})
"''${disk_devices[@]}"
udevadm trigger --subsystem-match=block; udevadm settle
${lib.optionalString (config.content != null) (config.content._create {dev = "/dev/md/${config.name}";})}
'';

2
types/mdraid.nix
View file

@ -23,7 +23,7 @@
_create = diskoLib.mkCreateOption {
inherit config options;
default = { dev }: ''
echo "${dev}" >> $disko_devices_dir/raid_${config.name}
echo "${dev}" >> "$disko_devices_dir"/raid_${config.name}
'';
};
_mount = diskoLib.mkMountOption {

2
types/zfs.nix
View file

@ -22,7 +22,7 @@
_create = diskoLib.mkCreateOption {
inherit config options;
default = { dev }: ''
echo "${dev}" >> $disko_devices_dir/zfs_${config.pool}
echo "${dev}" >> "$disko_devices_dir"/zfs_${config.pool}
'';
};
_mount = diskoLib.mkMountOption {

3
types/zpool.nix
View file

@ -52,11 +52,12 @@
_create = diskoLib.mkCreateOption {
inherit config options;
default = _: ''
readarray -t zfs_devices < <(cat "$disko_devices_dir"/zfs_${config.name})
zpool create ${config.name} \
${config.mode} \
${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-o ${n}=${v}") config.options)} \
${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-O ${n}=${v}") config.rootFsOptions)} \
$(tr '\n' ' ' < $disko_devices_dir/zfs_${config.name})
"''${zfs_devices[@]}"
${lib.concatMapStrings (dataset: dataset._create {zpool = config.name;}) (lib.attrValues config.datasets)}
'';
};