From e87daaee2fdb552c090995f9a862a9d473363b25 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 16 Jun 2022 22:41:04 +0200 Subject: [PATCH] nfsroot: adopt new deployment options --- hosts/containers/nfsroot/default.nix | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/hosts/containers/nfsroot/default.nix b/hosts/containers/nfsroot/default.nix index 256b6b62..41e01168 100644 --- a/hosts/containers/nfsroot/default.nix +++ b/hosts/containers/nfsroot/default.nix @@ -11,30 +11,12 @@ in { microvm = { hypervisor = "cloud-hypervisor"; mem = 2048; - - shares = [ { - source = "/nix/store"; - mountPoint = "/nix/.ro-store"; - tag = "store"; - proto = "virtiofs"; - socket = "store.socket"; - } ] ++ map (dir: { - source = "/var/lib/microvms/${config.networking.hostName}/${dir}"; - mountPoint = "/${dir}"; - tag = builtins.baseNameOf dir; - proto = "virtiofs"; - socket = "${builtins.baseNameOf dir}.socket"; - }) [ "etc" "home" "var" ]; - - volumes = map (export: { - mountPoint = "/${export}"; - image = "/dev/zvol/server10/vm/nfsroot/${builtins.baseNameOf export}"; - autoCreate = false; - }) nfsExports; - + }; + c3d2.deployment = { + server = "server10"; + mounts = [ "etc" "home" "var"]; interfaces = [ { - type = "tap"; - id = "nfsroot"; + net = "serv"; mac = "00:de:fa:c8:28:9c"; } ]; };