nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-09-17 09:37:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57 from a-kenji/fix-typos

Browse Source 
fix: typos
This commit is contained in:
Lassulus 2022-11-21 12:17:57 +01:00 committed by GitHub
commit 1668efc14a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disko
View File

@ -107,7 +107,7 @@ if [[ ! -z "${flake+x}" ]]; then
elif [[ ! -z "${disko_config+x}" ]] && [[ -e "$disko_config" ]]; then elif [[ ! -z "${disko_config+x}" ]] && [[ -e "$disko_config" ]]; then
nix_args+=("--arg" "diskoFile" "$disko_config") nix_args+=("--arg" "diskoFile" "$disko_config")
else else
abort "disko config must be an exising file or flake must be set" abort "disko config must be an existing file or flake must be set"
fi fi
script=$(nix-build "${libexec_dir}"/cli.nix \ script=$(nix-build "${libexec_dir}"/cli.nix \

4
types.nix
View File

@ -16,7 +16,7 @@ rec {
nestedTypes = typeAttr; nestedTypes = typeAttr;
}; };
# option for valid contents of partitons (basically like devices, but without tables) # option for valid contents of partitions (basically like devices, but without tables)
partitionType = mkOption { partitionType = mkOption {
type = types.nullOr (diskoLib.subType { inherit btrfs filesystem zfs mdraid luks lvm_pv; }); type = types.nullOr (diskoLib.subType { inherit btrfs filesystem zfs mdraid luks lvm_pv; });
default = null; default = null;
@ -138,7 +138,7 @@ rec {
sortedDeviceList = diskoLib.sortDevicesByDependencies ((diskoLib.meta devices).deviceDependencies or {}) devices; sortedDeviceList = diskoLib.sortDevicesByDependencies ((diskoLib.meta devices).deviceDependencies or {}) devices;
in '' in ''
set -efux set -efux
# first create the neccessary devices # first create the necessary devices
${concatStrings (map (dev: attrByPath (dev ++ [ "_mount" "dev" ]) "" devices) sortedDeviceList)} ${concatStrings (map (dev: attrByPath (dev ++ [ "_mount" "dev" ]) "" devices) sortedDeviceList)}
# and then mount the filesystems in alphabetical order # and then mount the filesystems in alphabetical order