nfroot: move tftp server from nix-build

nix-build is currently no more...
This commit is contained in:
Astro 2022-06-21 23:34:13 +02:00
parent cbb1269c9b
commit ed2334e8db
4 changed files with 10 additions and 21 deletions

View File

@ -404,11 +404,7 @@
nix-build = nixosSystem' { nix-build = nixosSystem' {
modules = [ modules = [
./hosts/containers/nix-build ./hosts/containers/nix-build
{ ];
_module.args.tftproots = nixpkgs.lib.filterAttrs (name: _:
builtins.match ".+-tftproot" name != null
) self.packages.x86_64-linux;
} ];
}; };
pulsebert = nixosSystem' { pulsebert = nixosSystem' {
@ -673,7 +669,11 @@
modules = [ modules = [
self.nixosModules.microvm self.nixosModules.microvm
./hosts/containers/nfsroot ./hosts/containers/nfsroot
]; {
_module.args.tftproots = nixpkgs.lib.filterAttrs (name: _:
builtins.match ".+-tftproot" name != null
) self.packages.x86_64-linux;
} ];
}; };
riscbert = nixosSystem' { riscbert = nixosSystem' {

View File

@ -8,6 +8,10 @@ let
"var/lib/dump-dvb/whoopsie" "var/lib/dump-dvb/whoopsie"
]; ];
in { in {
imports = [
./tftp.nix
];
microvm = { microvm = {
hypervisor = "cloud-hypervisor"; hypervisor = "cloud-hypervisor";
mem = 2048; mem = 2048;

View File

@ -17,12 +17,6 @@ in
{ {
networking.firewall.enable = false; networking.firewall.enable = false;
fileSystems."/var/lib/nfsroot/dacbert" = {
device = "${hostRegistry.hosts.nfsroot.ip4}:/var/lib/nfsroot/dacbert";
fsType = "nfs";
options = [ "nfsvers=3" "proto=tcp" "nolock" "soft" "async" "ro" ];
};
# raspberrypi boot # raspberrypi boot
services.atftpd = { services.atftpd = {
enable = true; enable = true;
@ -52,14 +46,6 @@ in
"${subnet}(${opts "ro" 0})" "${subnet}(${opts "ro" 0})"
) allowed ) allowed
} }
/var/lib/nfsroot/dacbert ${
lib.concatMapStringsSep " " (subnet:
"${subnet}(${opts "rw" 1})"
) allowed
}
''; '';
}; };
systemd.tmpfiles.rules = [
"d /var/lib/nfsroot/dacbert 0755 root root - -"
];
} }

View File

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./tftp.nix
]; ];
networking = { networking = {