ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29426 from Mic92/zfsUnstable

Browse Source 
nixos/zfs: import encrypted datasets by default for zfsUnstable
This commit is contained in:
Jörg Thalheim 2017-09-26 09:10:44 +01:00 committed by GitHub
commit c74418a4e6
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -140,6 +140,17 @@ in
this once.
'';
};
requestEncryptionCredentials = mkOption {
type = types.bool;
default = config.boot.zfs.enableUnstable;
description = ''
Request encryption keys or passwords for all encrypted datasets on import.
Dataset encryption is only supported in zfsUnstable at the moment.
'';
};
};
services.zfs.autoSnapshot = {
@ -263,6 +274,10 @@ in
assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot";
}
{
assertion = cfgZfs.requestEncryptionCredentials -> cfgZfs.enableUnstable;
message = "This feature is only available for zfs unstable. Set the NixOS option boot.zfs.enableUnstable.";
}
];
boot = {
@ -306,6 +321,9 @@ in
done
echo
if [[ -n "$msg" ]]; then echo "$msg"; fi
${lib.optionalString cfgZfs.requestEncryptionCredentials ''
zfs load-key -a
''}
'') rootPools));
};

6
pkgs/os-specific/linux/spl/default.nix
View File

@ -68,8 +68,8 @@ in
};
splUnstable = common {
version = "2017-08-11";
rev = "9df9692637aeee416f509c7f39655beb2d35b549";
sha256 = "1dggf6xqgk2f7vccv6cgvr8krj7h9f921szp1j2qbxnnq41m37mi";
version = "2017-09-26";
rev = "e8474f9ad3b3d23c3277535c4f53f8fd1e6cbd74";
sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7";
};
}

6
pkgs/os-specific/linux/zfs/default.nix
View File

@ -157,10 +157,10 @@ in {
incompatibleKernelVersion = null;
# this package should point to a version / git revision compatible with the latest kernel release
version = "2017-09-12";
version = "2017-09-26";
rev = "ded8f06a3cfee60b3a8ea5309e9c4d0e567ed3b5";
sha256 = "0yn4fg4a00hpflmmr0jbbhfb921nygpw2xbbjy35abl57k6zk375";
rev = "7e98073379353a05498ac5a2f1a5df2a2257d6b0";
sha256 = "1hydfhmngpq31gxkxipqxnin74l760d1ia202h12vsgix9sp32h7";
isUnstable = true;
extraPatches = [