git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/amazon-init.nix: add git/tar/gz, fix AMI configuration (#78363)

nixos/amazon-init.nix: add git/tar/gz, fix AMI configuration

commit3a4e550944cc0cf760766111944dd24f13081be6 authorSilvan Mosberger <contact@infinisil.com> dateThu 23 Jan 2020, 23:05 (7 years ago) parent589044a4da3513
2 files changed+4−4
nixos/modules/virtualisation/amazon-init.nix+2−3 nixos/release.nix+2−1
nixos/modules/virtualisation/amazon-init.nix+2−3
@@ -7,7 +7,7 @@ let
77 echo "attempting to fetch configuration from EC2 user data..."
88
99 export HOME=/root
10− export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
10+ 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
1111 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
1212
1313 userData=/etc/ec2-metadata/user-data
@@ -48,7 +48,7 @@ in {
4848 wantedBy = [ "multi-user.target" ];
4949 after = [ "multi-user.target" ];
5050 requires = [ "network-online.target" ];
51−
51+
5252 restartIfChanged = false;
5353 unitConfig.X-StopOnRemoval = false;
5454
@@ -58,4 +58,3 @@ in {
5858 };
5959 };
6060}
61−
nixos/release.nix+2−1
@@ -209,7 +209,8 @@ in rec {
209209 hydraJob ((import lib/eval-config.nix {
210210 inherit system;
211211 modules =
212− [ versionModule
212+ [ configuration
213+ versionModule
213214 ./maintainers/scripts/ec2/amazon-image.nix
214215 ];
215216 }).config.system.build.amazonImage)