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

kexec-installer-test: fix eval on 22.11

Browse source
This commit is contained in:
Jörg Thalheim 2022-12-16 13:45:54 +01:00
parent 3c28f1145f
commit c81bcbc1a8
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nix/kexec-installer/module.nix
View file

@ -16,7 +16,7 @@ in {
# This is a variant of the upstream kexecScript that also allows embedding
# a ssh key.
system.build.kexecRun = lib.mkForce (pkgs.writeScript "kexec-run" ''
system.build.kexecRun = pkgs.writeScript "kexec-run" ''
#!/usr/bin/env bash
set -ex
shopt -s nullglob
@ -72,7 +72,7 @@ in {
# We will kexec in background so we can cleanly finish the script before the hosts go down.
# This makes integration with tools like terraform easier.
nohup bash -c "sleep 6 && '$SCRIPT_DIR/kexec' -e" &
'');
'';
system.build.kexecTarball = pkgs.runCommand "kexec-tarball" {} ''
mkdir kexec $out

10
nix/kexec-installer/test.nix
View file

@ -93,9 +93,13 @@ in makeTest' {
ipv6Prefixes = [
{ ipv6PrefixConfig = { Prefix = "2001:db8::/64"; AddressAutoconfiguration = true; OnLink = true; }; }
];
ipv6RoutePrefixes = [
{ ipv6RoutePrefixConfig = { Route = "::/0"; LifetimeSec = 3600; }; }
];
# does not work in 22.11
#ipv6RoutePrefixes = [ { ipv6RoutePrefixConfig = { Route = "::/0"; LifetimeSec = 3600; }; }];
extraConfig = ''
[IPv6RoutePrefix]
Route = ::/0
LifetimeSec = 3600
'';
networkConfig = {
DHCPServer = true;
Address = "10.0.0.1/24";