emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #152 from nix-community/joerg-ci

Browse source 
disable installer channel in a single place
This commit is contained in:
Jörg Thalheim 2023-12-12 11:02:05 +01:00 committed by GitHub
commit d655cc02fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -21,7 +21,7 @@
let let
netboot = nixpkgs: (import (nixpkgs + "/nixos/release.nix") { }).netboot.${system}; netboot = nixpkgs: (import (nixpkgs + "/nixos/release.nix") { }).netboot.${system};
kexec-installer = nixpkgs: modules: (nixpkgs.legacyPackages.${system}.nixos (modules ++ [ self.nixosModules.kexec-installer ])).config.system.build.kexecTarball; kexec-installer = nixpkgs: modules: (nixpkgs.legacyPackages.${system}.nixos (modules ++ [ self.nixosModules.kexec-installer ])).config.system.build.kexecTarball;
netboot-installer = nixpkgs: modules: (nixpkgs.legacyPackages.${system}.nixos (modules ++ [ self.nixosModules.netboot-installer ])).config.system.build.netboot; netboot-installer = nixpkgs: (nixpkgs.legacyPackages.${system}.nixos [ self.nixosModules.netboot-installer ]).config.system.build.netboot;
in in
{ {
netboot-nixos-unstable = netboot nixos-unstable; netboot-nixos-unstable = netboot nixos-unstable;
@ -32,24 +32,18 @@
kexec-installer-nixos-unstable-noninteractive = kexec-installer nixos-unstable [ kexec-installer-nixos-unstable-noninteractive = kexec-installer nixos-unstable [
{ {
system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; system.kexec-installer.name = "nixos-kexec-installer-noninteractive";
system.installer.channel.enable = false;
} }
self.nixosModules.noninteractive self.nixosModules.noninteractive
]; ];
kexec-installer-nixos-2311-noninteractive = kexec-installer nixos-2311 [ kexec-installer-nixos-2311-noninteractive = kexec-installer nixos-2311 [
{ {
system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; system.kexec-installer.name = "nixos-kexec-installer-noninteractive";
system.installer.channel.enable = false;
} }
self.nixosModules.noninteractive self.nixosModules.noninteractive
]; ];
netboot-installer-nixos-unstable = netboot-installer nixos-unstable [ netboot-installer-nixos-unstable = netboot-installer nixos-unstable;
{ system.installer.channel.enable = false; } netboot-installer-nixos-2311 = netboot-installer nixos-2311;
];
netboot-installer-nixos-2311 = netboot-installer nixos-2311 [
{ system.installer.channel.enable = false; }
];
}); });
nixosModules = { nixosModules = {
kexec-installer = ./nix/kexec-installer/module.nix; kexec-installer = ./nix/kexec-installer/module.nix;

3
nix/installer.nix
View file

@ -27,6 +27,9 @@
./nix-settings.nix ./nix-settings.nix
]; ];
# Don't add nixpkgs to the image to save space, for our intended use case we don't need it
system.installer.channel.enable = false;
systemd.services.log-network-status = { systemd.services.log-network-status = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# No point in restarting this. We just need this after boot # No point in restarting this. We just need this after boot