diff options
| author | Graham Christensen <graham@grahamc.com> | 2020-01-22 19:02:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 19:02:44 -0500 |
| commit | ebb644a980d1c74aa233c8c4fe2a926e4e39f42c (patch) | |
| tree | 7d4857f7122c6c4221e08432c38dd3defb8c4b91 /nixos | |
| parent | 9894a1b4c25bd0518f9fac3643c6a5e14efff2b4 (diff) | |
| parent | 76ad649dd823d38c65c489869e763dd1869c090c (diff) | |
| download | nixpkgs-ebb644a980d1c74aa233c8c4fe2a926e4e39f42c.tar nixpkgs-ebb644a980d1c74aa233c8c4fe2a926e4e39f42c.tar.gz nixpkgs-ebb644a980d1c74aa233c8c4fe2a926e4e39f42c.tar.bz2 nixpkgs-ebb644a980d1c74aa233c8c4fe2a926e4e39f42c.tar.lz nixpkgs-ebb644a980d1c74aa233c8c4fe2a926e4e39f42c.tar.xz nixpkgs-ebb644a980d1c74aa233c8c4fe2a926e4e39f42c.tar.zst nixpkgs-ebb644a980d1c74aa233c8c4fe2a926e4e39f42c.zip | |
Merge pull request #76585 from serokell/mkaito/amazon-userdata-multiple-channels
virtualization/amazon-init: log multiple nix channels, fix nix path.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/amazon-init.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index 8032b2c6d7c..826c78a6e7f 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -8,7 +8,7 @@ let export HOME=/root export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH - export NIX_PATH=/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 @@ -18,9 +18,9 @@ let # that as the channel. if sed '/^\(#\|SSH_HOST_.*\)/d' < "$userData" | grep -q '\S'; then channels="$(grep '^###' "$userData" | sed 's|###\s*||')" - printf "%s" "$channels" | while read channel; do + while IFS= read -r channel; do echo "writing channel: $channel" - done + done < <(printf "%s\n" "$channels") if [[ -n "$channels" ]]; then printf "%s" "$channels" > /root/.nix-channels |