nixos/amazon-init.nix: add git/tar/gz, fix AMI configuration (#78363)
nixos/amazon-init.nix: add git/tar/gz, fix AMI configuration
This commit is contained in:
commit
3a4e550944
@ -7,7 +7,7 @@ let
|
|||||||
echo "attempting to fetch configuration from EC2 user data..."
|
echo "attempting to fetch configuration from EC2 user data..."
|
||||||
|
|
||||||
export HOME=/root
|
export HOME=/root
|
||||||
export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
|
export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
|
||||||
export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
|
export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
|
||||||
|
|
||||||
userData=/etc/ec2-metadata/user-data
|
userData=/etc/ec2-metadata/user-data
|
||||||
@ -48,7 +48,7 @@ in {
|
|||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
after = [ "multi-user.target" ];
|
after = [ "multi-user.target" ];
|
||||||
requires = [ "network-online.target" ];
|
requires = [ "network-online.target" ];
|
||||||
|
|
||||||
restartIfChanged = false;
|
restartIfChanged = false;
|
||||||
unitConfig.X-StopOnRemoval = false;
|
unitConfig.X-StopOnRemoval = false;
|
||||||
|
|
||||||
@ -58,4 +58,3 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -209,7 +209,8 @@ in rec {
|
|||||||
hydraJob ((import lib/eval-config.nix {
|
hydraJob ((import lib/eval-config.nix {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules =
|
modules =
|
||||||
[ versionModule
|
[ configuration
|
||||||
|
versionModule
|
||||||
./maintainers/scripts/ec2/amazon-image.nix
|
./maintainers/scripts/ec2/amazon-image.nix
|
||||||
];
|
];
|
||||||
}).config.system.build.amazonImage)
|
}).config.system.build.amazonImage)
|
||||||
|
Loading…
Reference in New Issue
Block a user