nova-image: use make-disk-image.nix
This commit is contained in:
parent
1703d4dc5d
commit
f1508b3a23
|
@ -110,7 +110,7 @@ pkgs.vmTools.runInLinuxVM (
|
||||||
umount /mnt/proc /mnt/dev /mnt/sys
|
umount /mnt/proc /mnt/dev /mnt/sys
|
||||||
umount /mnt
|
umount /mnt
|
||||||
|
|
||||||
# Do an fsck to make sure resize2fs works.
|
# Do a fsck to make sure resize2fs works.
|
||||||
fsck.${fsType} -f -y $rootDisk
|
fsck.${fsType} -f -y $rootDisk
|
||||||
''
|
''
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
{ config, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [ "${modulesPath}/virtualisation/nova-image.nix" ];
|
|
||||||
}
|
|
|
@ -1,90 +1,45 @@
|
||||||
|
# Usage:
|
||||||
|
# $ NIXOS_CONFIG=`pwd`/nixos/modules/virtualisation/nova-image.nix nix-build '<nixpkgs/nixos>' -A config.system.build.novaImage
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ ../profiles/qemu-guest.nix ../profiles/headless.nix ./ec2-data.nix ];
|
system.build.novaImage = import ../../lib/make-disk-image.nix {
|
||||||
|
inherit pkgs lib config;
|
||||||
system.build.novaImage =
|
partitioned = true;
|
||||||
pkgs.vmTools.runInLinuxVM (
|
diskSize = 1 * 1024;
|
||||||
pkgs.runCommand "nova-image"
|
configFile = pkgs.writeText "configuration.nix"
|
||||||
{ preVM =
|
''
|
||||||
''
|
{
|
||||||
mkdir $out
|
imports = [ <nixpkgs/nixos/modules/virtualisation/nova-image.nix> ];
|
||||||
diskImage=$out/image
|
|
||||||
${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G"
|
|
||||||
mv closure xchg/
|
|
||||||
'';
|
|
||||||
buildInputs = [ pkgs.utillinux pkgs.perl ];
|
|
||||||
exportReferencesGraph =
|
|
||||||
[ "closure" config.system.build.toplevel ];
|
|
||||||
}
|
}
|
||||||
''
|
'';
|
||||||
# Create a single / partition.
|
};
|
||||||
${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
|
|
||||||
${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
|
|
||||||
. /sys/class/block/vda1/uevent
|
|
||||||
mknod /dev/vda1 b $MAJOR $MINOR
|
|
||||||
|
|
||||||
# Create an empty filesystem and mount it.
|
imports = [
|
||||||
${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L nixos /dev/vda1
|
../profiles/qemu-guest.nix
|
||||||
${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
|
../profiles/headless.nix
|
||||||
mkdir /mnt
|
./ec2-data.nix
|
||||||
mount /dev/vda1 /mnt
|
];
|
||||||
|
|
||||||
# The initrd expects these directories to exist.
|
|
||||||
mkdir /mnt/dev /mnt/proc /mnt/sys
|
|
||||||
mount --bind /proc /mnt/proc
|
|
||||||
mount --bind /dev /mnt/dev
|
|
||||||
mount --bind /sys /mnt/sys
|
|
||||||
|
|
||||||
# Copy all paths in the closure to the filesystem.
|
|
||||||
storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
|
|
||||||
|
|
||||||
mkdir -p /mnt/nix/store
|
|
||||||
${pkgs.rsync}/bin/rsync -av $storePaths /mnt/nix/store/
|
|
||||||
|
|
||||||
# Register the paths in the Nix database.
|
|
||||||
printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
|
|
||||||
chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
|
|
||||||
|
|
||||||
# Create the system profile to allow nixos-rebuild to work.
|
|
||||||
chroot /mnt ${config.nix.package}/bin/nix-env --option build-users-group "" \
|
|
||||||
-p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
|
|
||||||
|
|
||||||
# `nixos-rebuild' requires an /etc/NIXOS.
|
|
||||||
mkdir -p /mnt/etc
|
|
||||||
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.
|
|
||||||
mkdir -p /mnt/etc/nixos
|
|
||||||
cp ${./nova-config.nix} /mnt/etc/nixos/configuration.nix
|
|
||||||
|
|
||||||
# Generate the GRUB menu.
|
|
||||||
chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
|
|
||||||
|
|
||||||
umount /mnt/proc /mnt/dev /mnt/sys
|
|
||||||
umount /mnt
|
|
||||||
''
|
|
||||||
);
|
|
||||||
|
|
||||||
fileSystems."/".device = "/dev/disk/by-label/nixos";
|
fileSystems."/".device = "/dev/disk/by-label/nixos";
|
||||||
|
|
||||||
boot.kernelParams = [ "console=ttyS0" ];
|
boot.kernelParams = [ "console=ttyS0" ];
|
||||||
|
|
||||||
boot.loader.grub.version = 2;
|
|
||||||
boot.loader.grub.device = "/dev/vda";
|
boot.loader.grub.device = "/dev/vda";
|
||||||
boot.loader.grub.timeout = 0;
|
boot.loader.grub.timeout = 0;
|
||||||
|
|
||||||
|
# Allow root logins
|
||||||
|
services.openssh.enable = true;
|
||||||
|
services.openssh.permitRootLogin = "without-password";
|
||||||
|
|
||||||
# Put /tmp and /var on /ephemeral0, which has a lot more space.
|
# Put /tmp and /var on /ephemeral0, which has a lot more space.
|
||||||
# Unfortunately we can't do this with the `fileSystems' option
|
# Unfortunately we can't do this with the `fileSystems' option
|
||||||
# because it has no support for creating the source of a bind
|
# because it has no support for creating the source of a bind
|
||||||
# mount. Also, "move" /nix to /ephemeral0 by layering a unionfs-fuse
|
# mount. Also, "move" /nix to /ephemeral0 by layering a unionfs-fuse
|
||||||
# mount on top of it so we have a lot more space for Nix operations.
|
# mount on top of it so we have a lot more space for Nix operations.
|
||||||
|
|
||||||
/*
|
/*
|
||||||
boot.initrd.postMountCommands =
|
boot.initrd.postMountCommands =
|
||||||
''
|
''
|
||||||
|
@ -106,10 +61,6 @@ with lib;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
|
boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# Allow root logins only using the SSH key that the user specified
|
|
||||||
# at instance creation time.
|
|
||||||
services.openssh.enable = true;
|
|
||||||
services.openssh.permitRootLogin = "without-password";
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue