summaryrefslogtreecommitdiffstats
path: root/example
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2022-12-25 18:25:37 +0000
committerGitHub <noreply@github.com>2022-12-25 18:25:37 +0000
commite3527b826d9ce94855cd0f2716c46cef76a4219a (patch)
treed63f70120437bb4fdcc4d0b656c674e533c6abea /example
parent11d5c74c30cec9783d8281a3af51d269ac7f3eab (diff)
parent164ea97c01ae57ecb76153ef43be4a184aa5d33a (diff)
Merge pull request #75 from nix-community/zap2HEADmaster
zap only devices we care about
Diffstat (limited to 'example')
-rw-r--r--example/complex.nix6
-rw-r--r--example/swap.nix4
-rw-r--r--example/zfs-over-legacy.nix2
3 files changed, 7 insertions, 5 deletions
diff --git a/example/complex.nix b/example/complex.nix
index b361196..939f71e 100644
--- a/example/complex.nix
+++ b/example/complex.nix
@@ -39,6 +39,9 @@
type = "luks";
name = "crypted1";
keyFile = "/tmp/secret.key";
+ extraArgs = [
+ "--iter-time 1"
+ ];
content = {
type = "lvm_pv";
vg = "pool";
@@ -64,6 +67,9 @@
type = "luks";
name = "crypted2";
keyFile = "/tmp/secret.key";
+ extraArgs = [
+ "--iter-time 1"
+ ];
content = {
type = "lvm_pv";
vg = "pool";
diff --git a/example/swap.nix b/example/swap.nix
index 0693caa..13393fe 100644
--- a/example/swap.nix
+++ b/example/swap.nix
@@ -25,7 +25,6 @@
start = "100MiB";
end = "-1G";
part-type = "primary";
- bootable = true;
content = {
type = "filesystem";
format = "ext4";
@@ -33,12 +32,11 @@
};
}
{
- name = "root";
+ name = "swap";
type = "partition";
start = "-1G";
end = "100%";
part-type = "primary";
- bootable = true;
content = {
type = "swap";
randomEncryption = true;
diff --git a/example/zfs-over-legacy.nix b/example/zfs-over-legacy.nix
index 8e02b00..1a6bbd3 100644
--- a/example/zfs-over-legacy.nix
+++ b/example/zfs-over-legacy.nix
@@ -49,7 +49,6 @@
zpool = {
zroot = {
type = "zpool";
- rootFsOptions.mountpoint = "none";
datasets = {
"root" = {
zfs_type = "filesystem";
@@ -58,7 +57,6 @@
"root/zfs_fs" = {
zfs_type = "filesystem";
mountpoint = "/zfs_fs";
- options.mountpoint = "/zfs_fs";
options."com.sun:auto-snapshot" = "true";
};
};