From 1237ac36db1a457ae561134d191d2924a9ce5ffc Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 25 Aug 2022 13:13:20 +0200 Subject: fix mdadm mounting, move test to mdadm test --- example/mdadm.nix | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ example/raid.nix | 60 ------------------------------------------------------- 2 files changed, 59 insertions(+), 60 deletions(-) create mode 100644 example/mdadm.nix delete mode 100644 example/raid.nix (limited to 'example') diff --git a/example/mdadm.nix b/example/mdadm.nix new file mode 100644 index 0000000..cb0ad91 --- /dev/null +++ b/example/mdadm.nix @@ -0,0 +1,59 @@ +# usage: nix-instantiate --eval --json --strict example/config.nix | jq . +{ + type = "devices"; + content = { + vdb = { + type = "table"; + format = "gpt"; + partitions = [ + { + type = "partition"; + part-type = "primary"; + start = "1MiB"; + end = "100%"; + content = { + type = "mdraid"; + name = "raid1"; + }; + } + ]; + }; + vdc = { + type = "table"; + format = "gpt"; + partitions = [ + { + type = "partition"; + part-type = "primary"; + start = "1MiB"; + end = "100%"; + content = { + type = "mdraid"; + name = "raid1"; + }; + } + ]; + }; + raid1 = { + type = "mdadm"; + level = 1; + content = { + type = "table"; + format = "gpt"; + partitions = [ + { + type = "partition"; + part-type = "primary"; + start = "1MiB"; + end = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/raid"; + }; + } + ]; + }; + }; + }; +} diff --git a/example/raid.nix b/example/raid.nix deleted file mode 100644 index 490ea01..0000000 --- a/example/raid.nix +++ /dev/null @@ -1,60 +0,0 @@ -# usage: nix-instantiate --eval --json --strict example/config.nix | jq . -{ - type = "devices"; - content = { - vdb = { - type = "table"; - format = "gpt"; - partitions = [ - { - type = "partition"; - part-type = "primary"; - start = "1MiB"; - end = "100%"; - content = { - type = "mdraid"; - name = "raid1"; - }; - } - ]; - }; - vdc = { - type = "table"; - format = "gpt"; - partitions = [ - { - type = "partition"; - part-type = "primary"; - start = "1MiB"; - end = "100%"; - content = { - type = "mdraid"; - name = "raid1"; - }; - } - ]; - }; - raid1 = { - type = "mdadm"; - level = 1; - content = { - type = "table"; - format = "gpt"; - partitions = [ - { - type = "partition"; - part-type = "primary"; - start = "1MiB"; - end = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/raid"; - }; - } - ]; - - }; - }; - }; -} -- cgit v1.2.3