alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Add option ec2.hvm, to set some boot configuration specific for EC2 HVM instances.

Browse source 
(cherry picked from commit 35c76d9173)

Conflicts:
	nixos/modules/virtualisation/amazon-image.nix
This commit is contained in:
Rob Vermaas 2014-05-21 10:55:34 +02:00
parent d05e832b14
commit 3da94435c0
1 changed files with 148 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
nixos/modules/virtualisation/amazon-image.nix
View file

@ -1,10 +1,24 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
let
cfg = config.ec2;
in
{ {
imports = [ ../profiles/headless.nix ./ec2-data.nix ]; imports = [ ../profiles/headless.nix ./ec2-data.nix ];
options = {
ec2 = {
hvm = mkOption {
default = false;
description = ''
Whether the EC2 instance is a HVM instance.
'';
};
};
};
config = {
system.build.amazonImage = system.build.amazonImage =
pkgs.vmTools.runInLinuxVM ( pkgs.vmTools.runInLinuxVM (
pkgs.runCommand "amazon-image" pkgs.runCommand "amazon-image"
@ -70,13 +84,12 @@ with lib;
boot.initrd.kernelModules = [ "xen-blkfront" ]; boot.initrd.kernelModules = [ "xen-blkfront" ];
boot.kernelModules = [ "xen-netfront" ]; boot.kernelModules = [ "xen-netfront" ];
boot.kernelParams = [ "console=ttyS0" ];
# Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd.
boot.loader.grub.version = 1; boot.loader.grub.version = 1;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = if cfg.hvm then "/dev/xvda" else "nodev";
boot.loader.grub.timeout = 0; boot.loader.grub.timeout = 0;
boot.loader.grub.extraPerEntryConfig = "root (hd0)"; boot.loader.grub.extraPerEntryConfig = "root (hd0${lib.optionalString cfg.hvm ",0"})";
boot.initrd.postDeviceCommands = boot.initrd.postDeviceCommands =
'' ''
@ -161,4 +174,10 @@ with lib;
environment.systemPackages = [ pkgs.cryptsetup ]; environment.systemPackages = [ pkgs.cryptsetup ];
boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
# Prevent logging in as root without a password. This doesn't really matter,
# since the only PAM services that allow logging in with a null
# password are local ones that are inaccessible on EC2 machines.
security.initialRootPassword = mkDefault "!";
};
} }