BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Don't get the hostname from EC2 if one has been set explicitly.

Browse source 
svn path=/nixos/trunk/; revision=30200
This commit is contained in:
Eelco Dolstra 2011-11-03 01:29:40 +00:00
parent fe566d84ae
commit ba1a7188c1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/virtualisation/ec2-data.nix
View file

@ -4,6 +4,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
with pkgs.lib;
{ {
jobs.fetchEC2Data = jobs.fetchEC2Data =
@ -16,7 +18,9 @@
script = script =
'' ''
echo "setting host name..." echo "setting host name..."
${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname) ${optionalString (config.networking.hostName == "") ''
${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname)
''}
# Don't download the SSH key if it has already been injected # Don't download the SSH key if it has already been injected
# into the image (a Nova feature). # into the image (a Nova feature).