diff --git a/machines/kharbranth/default.nix b/machines/kharbranth/default.nix index 098268c2..135c81aa 100644 --- a/machines/kharbranth/default.nix +++ b/machines/kharbranth/default.nix @@ -33,6 +33,7 @@ location = "lasting-integrity"; } ]; + rootDataset = "rpool/local/root"; }; }; } diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix index 645bd2a3..27cddb88 100644 --- a/machines/kholinar/default.nix +++ b/machines/kholinar/default.nix @@ -33,6 +33,7 @@ location = "lasting-integrity"; } ]; + rootDataset = "rpool/local/root"; }; }; } diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix index 5aed485b..90d610cd 100644 --- a/machines/lasting-integrity/default.nix +++ b/machines/lasting-integrity/default.nix @@ -29,6 +29,7 @@ fast = true; location = "192.168.0.1"; }]; + rootDataset = "zroot/local/root"; }; }; } diff --git a/machines/urithiru/default.nix b/machines/urithiru/default.nix index b30dd7ac..3cec9883 100644 --- a/machines/urithiru/default.nix +++ b/machines/urithiru/default.nix @@ -36,6 +36,7 @@ location = "192.168.0.2"; } ]; + rootDataset = "zroot/local/root"; }; }; } diff --git a/modules/zfs.nix b/modules/zfs.nix index ce2d2004..788613f6 100644 --- a/modules/zfs.nix +++ b/modules/zfs.nix @@ -40,6 +40,9 @@ in location = "lasting-integrity.vanpetegem.me"; }]; }; + rootDataset = lib.mkOption { + example = "rpool/local/root"; + }; }; config = lib.mkIf config.chvp.zfs.enable { @@ -50,7 +53,7 @@ in supportedFilesystems = [ "zfs" ]; zfs.requestEncryptionCredentials = config.chvp.zfs.encrypted; initrd.postDeviceCommands = lib.mkAfter '' - zfs rollback -r rpool/local/root@blank + zfs rollback -r ${config.chvp.zfs.rootDataset}@blank ''; };