Fix some env variables and add LUKS and ecryptfs support