public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update create-s3-amis and amazon-image.nix to recent nixos

Browse Source
This commit is contained in:
Shea Levy 2012-12-18 13:44:47 -05:00
parent ab18c03685
commit 3ef1432866
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/scripts/ec2/create-s3-amis.sh
View File

@ -1,6 +1,7 @@
#! /bin/sh -e #! /bin/sh -e
revision=$(svnversion "$NIXOS") nixos=$(nix-instantiate --find-file nixos)
revision=$(cd $nixos; git rev-parse --short HEAD)
echo "NixOS revision is $revision" echo "NixOS revision is $revision"
buildAndUploadFor() { buildAndUploadFor() {
@ -8,7 +9,7 @@ buildAndUploadFor() {
arch="$2" arch="$2"
echo "building $system image..." echo "building $system image..."
NIXOS_CONFIG=$NIXOS/modules/virtualisation/amazon-config.nix nix-build "$NIXOS" \ NIXOS_CONFIG=$nixos/modules/virtualisation/amazon-config.nix nix-build "$nixos" \
-A config.system.build.amazonImage --argstr system "$system" -o ec2-ami -A config.system.build.amazonImage --argstr system "$system" -o ec2-ami
ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \ ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \

4
modules/virtualisation/amazon-image.nix
View File

@ -50,6 +50,10 @@ with pkgs.lib;
mkdir -p /mnt/etc mkdir -p /mnt/etc
touch /mnt/etc/NIXOS touch /mnt/etc/NIXOS
# `switch-to-configuration' requires a /bin/sh
mkdir -p /mnt/bin
ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
# Install a configuration.nix. # Install a configuration.nix.
mkdir -p /mnt/etc/nixos mkdir -p /mnt/etc/nixos
cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix