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

re-add mkCreateOption

Browse source
This commit is contained in:
phaer 2023-01-10 10:25:21 +01:00
parent 7b59532520
commit 313d0e2315
1 changed files with 44 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

129
types.nix
View file

@ -141,6 +141,16 @@ rec {
}; };
}; };
mkCreateOption = { config, options, default }:
mkOption {
internal = true;
readOnly = true;
type = types.functionTo types.str;
default = {}: "";
description = "Creation script";
};
/* Takes a disko device specification, returns an attrset with metadata /* Takes a disko device specification, returns an attrset with metadata
meta :: types.devices -> AttrSet meta :: types.devices -> AttrSet
@ -304,12 +314,9 @@ rec {
}; };
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {}: ""; default = {}: "";
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -383,15 +390,12 @@ rec {
diskoLib.deepMergeMap (subvol: subvol._meta dev) (attrValues config.subvolumes); diskoLib.deepMergeMap (subvol: subvol._meta dev) (attrValues config.subvolumes);
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev}: '' default = {dev}: ''
mkfs.btrfs ${dev} ${config.extraArgs} mkfs.btrfs ${dev} ${config.extraArgs}
${concatMapStrings (subvol: subvol._create { inherit dev; }) (attrValues config.subvolumes)} ${concatMapStrings (subvol: subvol._create { inherit dev; }) (attrValues config.subvolumes)}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -475,10 +479,8 @@ rec {
}; };
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev}: '' default = {dev}: ''
MNTPOINT=$(mktemp -d) MNTPOINT=$(mktemp -d)
( (
@ -487,7 +489,6 @@ rec {
btrfs subvolume create "$MNTPOINT"/${config.name} ${config.extraArgs} btrfs subvolume create "$MNTPOINT"/${config.name} ${config.extraArgs}
) )
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -567,16 +568,13 @@ rec {
}; };
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev}: '' default = {dev}: ''
mkfs.${config.format} \ mkfs.${config.format} \
${config.extraArgs} \ ${config.extraArgs} \
${dev} ${dev}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -652,15 +650,12 @@ rec {
diskoLib.deepMergeMap (partition: partition._meta dev) config.partitions; diskoLib.deepMergeMap (partition: partition._meta dev) config.partitions;
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev}: '' default = {dev}: ''
parted -s ${dev} -- mklabel ${config.format} parted -s ${dev} -- mklabel ${config.format}
${concatMapStrings (partition: partition._create {inherit dev; type = config.format;} ) config.partitions} ${concatMapStrings (partition: partition._create {inherit dev; type = config.format;} ) config.partitions}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -751,10 +746,8 @@ rec {
optionalAttrs (!isNull config.content) (config.content._meta dev); optionalAttrs (!isNull config.content) (config.content._meta dev);
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev, type}: '' default = {dev, type}: ''
${optionalString (type == "gpt") '' ${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}
@ -774,7 +767,6 @@ rec {
udevadm trigger --subsystem-match=block; udevadm settle udevadm trigger --subsystem-match=block; udevadm settle
${optionalString (!isNull config.content) (config.content._create {dev = (diskoLib.deviceNumbering dev config.index);})} ${optionalString (!isNull config.content) (config.content._create {dev = (diskoLib.deviceNumbering dev config.index);})}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -821,14 +813,11 @@ rec {
}; };
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev}: '' default = {dev}: ''
mkswap ${dev} mkswap ${dev}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -884,15 +873,12 @@ rec {
}; };
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev}: '' default = {dev}: ''
pvcreate ${dev} pvcreate ${dev}
LVMDEVICES_${config.vg}="''${LVMDEVICES_${config.vg}:-}${dev} " LVMDEVICES_${config.vg}="''${LVMDEVICES_${config.vg}:-}${dev} "
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -943,15 +929,12 @@ rec {
diskoLib.deepMergeMap (lv: lv._meta [ "lvm_vg" config.name ]) (attrValues config.lvs); diskoLib.deepMergeMap (lv: lv._meta [ "lvm_vg" config.name ]) (attrValues config.lvs);
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {}: '' default = {}: ''
vgcreate ${config.name} $LVMDEVICES_${config.name} vgcreate ${config.name} $LVMDEVICES_${config.name}
${concatMapStrings (lv: lv._create {vg = config.name; }) (attrValues config.lvs)} ${concatMapStrings (lv: lv._create {vg = config.name; }) (attrValues config.lvs)}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -1021,10 +1004,8 @@ rec {
optionalAttrs (!isNull config.content) (config.content._meta dev); optionalAttrs (!isNull config.content) (config.content._meta dev);
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {vg}: '' default = {vg}: ''
lvcreate \ lvcreate \
--yes \ --yes \
@ -1035,7 +1016,6 @@ rec {
${vg} ${vg}
${optionalString (!isNull config.content) (config.content._create {dev = "/dev/${vg}/${config.name}";})} ${optionalString (!isNull config.content) (config.content._create {dev = "/dev/${vg}/${config.name}";})}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -1087,14 +1067,11 @@ rec {
}; };
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev}: '' default = {dev}: ''
ZFSDEVICES_${config.pool}="''${ZFSDEVICES_${config.pool}:-}${dev} " ZFSDEVICES_${config.pool}="''${ZFSDEVICES_${config.pool}:-}${dev} "
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -1171,10 +1148,8 @@ rec {
diskoLib.deepMergeMap (dataset: dataset._meta [ "zpool" config.name ]) (attrValues config.datasets); diskoLib.deepMergeMap (dataset: dataset._meta [ "zpool" config.name ]) (attrValues config.datasets);
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {}: '' default = {}: ''
zpool create ${config.name} \ zpool create ${config.name} \
${config.mode} \ ${config.mode} \
@ -1183,7 +1158,6 @@ rec {
''${ZFSDEVICES_${config.name}} ''${ZFSDEVICES_${config.name}}
${concatMapStrings (dataset: dataset._create {zpool = config.name;}) (attrValues config.datasets)} ${concatMapStrings (dataset: dataset._create {zpool = config.name;}) (attrValues config.datasets)}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -1286,10 +1260,8 @@ rec {
optionalAttrs (!isNull config.content) (config.content._meta dev); optionalAttrs (!isNull config.content) (config.content._meta dev);
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {zpool}: '' default = {zpool}: ''
zfs create ${zpool}/${config.name} \ zfs create ${zpool}/${config.name} \
${concatStringsSep " " (mapAttrsToList (n: v: "-o ${n}=${v}") config.options)} \ ${concatStringsSep " " (mapAttrsToList (n: v: "-o ${n}=${v}") config.options)} \
@ -1299,7 +1271,6 @@ rec {
${optionalString (!isNull config.content) (config.content._create {dev = "/dev/zvol/${zpool}/${config.name}";})} ${optionalString (!isNull config.content) (config.content._create {dev = "/dev/zvol/${zpool}/${config.name}";})}
''} ''}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -1374,10 +1345,8 @@ rec {
optionalAttrs (!isNull config.content) (config.content._meta [ "mdadm" config.name ]); optionalAttrs (!isNull config.content) (config.content._meta [ "mdadm" config.name ]);
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {}: '' default = {}: ''
echo 'y' | mdadm --create /dev/md/${config.name} \ echo 'y' | mdadm --create /dev/md/${config.name} \
--level=${toString config.level} \ --level=${toString config.level} \
@ -1389,7 +1358,6 @@ rec {
udevadm trigger --subsystem-match=block; udevadm settle udevadm trigger --subsystem-match=block; udevadm settle
${optionalString (!isNull config.content) (config.content._create {dev = "/dev/md/${config.name}";})} ${optionalString (!isNull config.content) (config.content._create {dev = "/dev/md/${config.name}";})}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -1438,15 +1406,12 @@ rec {
}; };
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev}: '' default = {dev}: ''
RAIDDEVICES_N_${config.name}=$((''${RAIDDEVICES_N_${config.name}:-0}+1)) RAIDDEVICES_N_${config.name}=$((''${RAIDDEVICES_N_${config.name}:-0}+1))
RAIDDEVICES_${config.name}="''${RAIDDEVICES_${config.name}:-}${dev} " RAIDDEVICES_${config.name}="''${RAIDDEVICES_${config.name}:-}${dev} "
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -1502,16 +1467,13 @@ rec {
optionalAttrs (!isNull config.content) (config.content._meta dev); optionalAttrs (!isNull config.content) (config.content._meta dev);
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {dev}: '' default = {dev}: ''
cryptsetup -q luksFormat ${dev} ${diskoLib.maybeStr config.keyFile} ${toString config.extraArgs} cryptsetup -q luksFormat ${dev} ${diskoLib.maybeStr config.keyFile} ${toString config.extraArgs}
cryptsetup luksOpen ${dev} ${config.name} ${optionalString (!isNull config.keyFile) "--key-file ${config.keyFile}"} cryptsetup luksOpen ${dev} ${config.name} ${optionalString (!isNull config.keyFile) "--key-file ${config.keyFile}"}
${optionalString (!isNull config.content) (config.content._create {dev = "/dev/mapper/${config.name}";})} ${optionalString (!isNull config.content) (config.content._create {dev = "/dev/mapper/${config.name}";})}
''; '';
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;
@ -1577,12 +1539,9 @@ rec {
optionalAttrs (!isNull config.content) (config.content._meta [ "disk" config.device ]); optionalAttrs (!isNull config.content) (config.content._meta [ "disk" config.device ]);
description = "Metadata"; description = "Metadata";
}; };
_create = mkOption { _create = diskoLib.mkCreateOption {
internal = true; inherit config options;
readOnly = true;
type = types.functionTo types.str;
default = {}: config.content._create {dev = config.device;}; default = {}: config.content._create {dev = config.device;};
description = "Creation script";
}; };
_mount = mkOption { _mount = mkOption {
internal = true; internal = true;