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

Merge pull request #200 from phaer/zfs-hooks-test

Browse source
This commit is contained in:
Lassulus 2023-04-11 11:37:49 +02:00 • committed by GitHub
commit 75fa173ef1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
example/zfs.nix
View file

@ -64,6 +64,7 @@
"com.sun:auto-snapshot" = "false"; "com.sun:auto-snapshot" = "false";
}; };
mountpoint = "/"; mountpoint = "/";
postCreateHook = "zfs snapshot zroot@blank";
datasets = { datasets = {
zfs_fs = { zfs_fs = {
@ -98,6 +99,9 @@
keyformat = "passphrase"; keyformat = "passphrase";
keylocation = "file:///tmp/secret.key"; keylocation = "file:///tmp/secret.key";
}; };
postCreateHook = ''
zfs set keylocation="prompt" "zroot/$name";
'';
}; };
"encrypted/test" = { "encrypted/test" = {
zfs_type = "filesystem"; zfs_type = "filesystem";

6
tests/zfs.nix
View file

@ -8,9 +8,6 @@ makeDiskoTest {
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!
boot.zfs.requestEncryptionCredentials = true; boot.zfs.requestEncryptionCredentials = true;
}; };
postDisko = ''
machine.succeed("zfs set keylocation=prompt zroot/encrypted")
'';
enableOCR = true; enableOCR = true;
bootCommands = '' bootCommands = ''
machine.wait_for_text("passphrase for") machine.wait_for_text("passphrase for")
@ -32,6 +29,9 @@ makeDiskoTest {
assert_property("zroot/zfs_testvolume", "volsize", "10M") assert_property("zroot/zfs_testvolume", "volsize", "10M")
assert_property("zroot/zfs_unmounted_fs", "mountpoint", "none") assert_property("zroot/zfs_unmounted_fs", "mountpoint", "none")
assert_property("zroot/encrypted", "keylocation", "prompt")
machine.succeed("zfs get name zroot@blank")
machine.succeed("mountpoint /zfs_fs"); machine.succeed("mountpoint /zfs_fs");
machine.succeed("mountpoint /zfs_legacy_fs"); machine.succeed("mountpoint /zfs_legacy_fs");
machine.succeed("mountpoint /ext4onzfs"); machine.succeed("mountpoint /ext4onzfs");