Compare commits

..

2 commits

Author SHA1 Message Date
Yureka 830dcbf6bc builders: do not mount / and /boot on netboot systems 2024-08-03 18:41:01 +02:00
Yureka f7907a2915 update hydra 2024-08-03 18:40:25 +02:00
3 changed files with 32 additions and 27 deletions

View file

@ -258,17 +258,17 @@
]
},
"locked": {
"lastModified": 1721682989,
"narHash": "sha256-kjJiZ7m4HKqbZ2mxNQiB32/goKFb8BRi8OqC4wIU0OI=",
"lastModified": 1722688238,
"narHash": "sha256-x6BnYtArF6IDs7bS8ExokgAQBOlrxXxD0EOBIlASmfM=",
"ref": "refs/heads/main",
"rev": "4b107e6ff36bd89958fba36e0fe0340903e7cd13",
"revCount": 4190,
"rev": "9b5ac87de73ea4646dbb2af979db91f096d29960",
"revCount": 4191,
"type": "git",
"url": "https://git.lix.systems/lix-project/hydra.git"
"url": "https://git.lix.systems/the-distro/hydra.git"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/hydra.git"
"url": "https://git.lix.systems/the-distro/hydra.git"
}
},
"lix": {

View file

@ -11,7 +11,7 @@
colmena.url = "github:zhaofengli/colmena";
colmena.inputs.nixpkgs.follows = "nixpkgs";
hydra.url = "git+https://git.lix.systems/lix-project/hydra.git";
hydra.url = "git+https://git.lix.systems/the-distro/hydra.git";
hydra.inputs.nixpkgs.follows = "nixpkgs";
nix-gerrit.url = "git+https://git.lix.systems/the-distro/nix-gerrit.git";

View file

@ -55,29 +55,34 @@ in
boot.initrd.services.lvm.enable = true;
fileSystems."/" = {
boot.kernel.sysctl."fs.xfs.xfssyncd_centisecs" = "12000";
fileSystems = lib.mkMerge [
{
"/" = {
device = "/dev/disk/by-label/root";
fsType = "xfs";
};
fileSystems."/mnt" = {
device = "/dev/disk/by-label/hydra";
fsType = "xfs";
options = ["logbsize=256k"];
};
boot.kernel.sysctl."fs.xfs.xfssyncd_centisecs" = "12000";
# We want the tmp filesystem on the same filesystem as the hydra store, so that builds can use reflinks
fileSystems."/tmp" = {
device = "/mnt/tmp";
options = [ "bind" ];
};
fileSystems."/boot" = {
"/boot" = {
device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
}
(lib.mkIf (!cfg.netboot) {
"/mnt" = {
device = "/dev/disk/by-label/hydra";
fsType = "xfs";
options = ["logbsize=256k"];
};
# We want the tmp filesystem on the same filesystem as the hydra store, so that builds can use reflinks
"/tmp" = {
device = "/mnt/tmp";
options = [ "bind" ];
};
})
];
swapDevices = lib.optionals (!cfg.netboot) [
{