diff options
author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2015-05-26 11:05:06 +0100 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2015-05-26 11:05:06 +0100 |
commit | 0d454d863fae6c76aedf990b8ea43b7a322e745d (patch) | |
tree | 5c7b4daaf483b855b86de51bcdcc40d42def9435 /nixos/modules/virtualisation | |
parent | d17429142bbce384397ef882d21b4cbfd4bf5608 (diff) | |
parent | bd5011fc34e20b7bf15970b29496e6406ee2bcff (diff) |
Merge pull request #7876 from rzetterberg/issue-7869
nixos: Fixes eval and build error of nova image builder
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/nova-image.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix index 2523dacc0b563..9738552774d02 100644 --- a/nixos/modules/virtualisation/nova-image.nix +++ b/nixos/modules/virtualisation/nova-image.nix @@ -46,16 +46,20 @@ with lib; # 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 + 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 \ + 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 @@ -106,7 +110,6 @@ with lib; # Since Nova allows VNC access to instances, it's nice to start to # start a few virtual consoles. - services.mingetty.ttys = [ "tty1" "tty2" ]; # Allow root logins only using the SSH key that the user specified # at instance creation time. |