fix ordering on postResumeCommands
ZFS moved import from postDeviceCommands to postResumeCommands and now my key import doesnt work :( Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
@ -16,25 +16,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
postResumeCommands = ''
|
||||
# let root mount and everything, then manually unlock stuff
|
||||
load_zfs_nix() {
|
||||
local device="/dev/disk/by-uuid/8bfaa32b-09dd-45c8-831e-05e80be82f9e"
|
||||
local mountPoint="/"
|
||||
local options="x-initrd.mount,noatime,nodiratime"
|
||||
local fsType="ext4"
|
||||
|
||||
echo "manually mounting key location, then unmounting"
|
||||
udevadm settle
|
||||
|
||||
mountFS "$device" "$(escapeFstab "$mountPoint")" "$(escapeFstab "$options")" "$fsType"
|
||||
|
||||
zfs load-key -L "file://$targetRoot/crypto/keys/zfs-nix-store-key" "ZFS-primary/nix"
|
||||
umount "$targetRoot/"
|
||||
}
|
||||
|
||||
load_zfs_nix
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user