diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2013-12-12 12:48:09 +0100 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2013-12-12 12:48:09 +0100 |
| commit | 61d346eaaf6327cba260a0d1c67112dbe37ad4cf (patch) | |
| tree | 330919a4b7d44a71ab7db3bab20ad5031be9a137 /nixos/modules/virtualisation | |
| parent | 8c2dd86fe282adc473590c5ba09ee6d96f27717f (diff) | |
| download | nixlib-61d346eaaf6327cba260a0d1c67112dbe37ad4cf.tar nixlib-61d346eaaf6327cba260a0d1c67112dbe37ad4cf.tar.gz nixlib-61d346eaaf6327cba260a0d1c67112dbe37ad4cf.tar.bz2 nixlib-61d346eaaf6327cba260a0d1c67112dbe37ad4cf.tar.lz nixlib-61d346eaaf6327cba260a0d1c67112dbe37ad4cf.tar.xz nixlib-61d346eaaf6327cba260a0d1c67112dbe37ad4cf.tar.zst nixlib-61d346eaaf6327cba260a0d1c67112dbe37ad4cf.zip | |
Google Compute image: fix punctuation in description, give disk image proper name with version and revision.
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/google-compute-image.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 3254d64b2849..098c9ede8533 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -11,7 +11,7 @@ with pkgs.lib; { preVM = '' mkdir $out - diskImage=$out/disk.raw + diskImage=$out/$diskImageBase truncate $diskImage --size 10G mv closure xchg/ ''; @@ -20,11 +20,11 @@ with pkgs.lib; '' PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin pushd $out - tar -Szcf disk.raw.tar.gz disk.raw - rm $out/disk.raw + tar -Szcf $diskImageBase.tar.gz $diskImageBase + rm $out/$diskImageBase popd ''; - + diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; buildInputs = [ pkgs.utillinux pkgs.perl ]; exportReferencesGraph = [ "closure" config.system.build.toplevel ]; @@ -121,9 +121,8 @@ with pkgs.lib; 169.254.169.254 metadata.google.internal metadata ''; - # fetch authorized keys for root user systemd.services.fetch-root-authorized-keys = - { description = "Fetch authorized_keys for root user."; + { description = "Fetch authorized_keys for root user"; wantedBy = [ "multi-user.target" ]; before = [ "sshd.service" ]; |