Eelco Dolstra
b37d6d8996
Fix failure to start old containers
...
The existence of $root/var/lib/private/host-notify as a socket
prevented a bind mount:
container foo[8083]: Failed to create mount point /var/lib/containers/foo/var/lib/private/host-notify: No such device or address
2016-05-26 16:19:40 +02:00
Eelco Dolstra
845c9b50bf
boot.initrd.luks.devices: Change into an attribute set
...
This allows setting options for the same LUKS device in different
modules. For example, the auto-generated hardware-configuration.nix
can contain
boot.initrd.luks.devices.crypted.device = "/dev/disk/...";
while configuration.nix can add
boot.initrd.luks.devices.crypted.allowDiscards = true;
Also updated the examples/docs to use /disk/disk/by-uuid instead of
/dev/sda, since we shouldn't promote the use of the latter.
2016-05-25 18:04:21 +02:00
Eelco Dolstra
32bed83b18
Remove boot.loader.grub.timeout and boot.loader.gummiboot.timeout
...
There is a generic boot.loader.timeout option.
2016-05-25 11:39:17 +02:00
zimbatm
3ade1e7d3e
Merge branch 'pr/14911'
2016-05-05 21:28:27 +01:00
Joaquim Pedro França Simão
133dc10e5a
open-vm-tools: fixes host VMware errors
2016-05-05 21:27:54 +01:00
Eelco Dolstra
ecfc523d32
Update EC2 AMIs to 16.03.659.011ea84
...
This includes the binutils mass rebuild.
2016-04-29 10:28:35 +02:00
Tuomas Tynkkynen
60f5659dad
treewide: Use correct output in ${config.nix.package}/bin
2016-04-25 16:44:37 +02:00
Tuomas Tynkkynen
bee04a37ad
amazon-init.nix: Use makeBinPath
...
This also fixes the incorrect use of 'dev' outputs from
config.nix.package and pkgs.systemd.
2016-04-25 16:44:37 +02:00
Franz Pletz
8cca66f774
Merge pull request #14018 from kampfschlaefer/feature/hostbridge_and_ipv6_for_containers
...
containers: hostbridge and IPv6
2016-04-24 20:33:46 +02:00
Tuomas Tynkkynen
d0c127487f
qemu-img: Fix module paths
...
They are compressed nowadays.
Not sure if these are really needed since nobody noticed they were
broken, but anyway...
2016-04-22 10:42:31 +03:00
Tuomas Tynkkynen
01854a850a
treewide: Replace module_init_tools -> kmod
...
The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
2016-04-22 10:40:57 +03:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502
for nixpkgs
2016-04-10 11:17:52 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Eelco Dolstra
ab2855b975
Add 16.03 AMIs
2016-04-05 11:25:12 +02:00
Arnold Krille
3c819f28f5
containers: Make declarative containers real systemd services
...
Without the templating (which is still present for imperative containers), it
will be possible to set individual dependencies. Like depending on the network
only if the hostbridge or hardware interfaces are used.
Ported from #3021
2016-04-02 17:07:41 +02:00
Arnold Krille
aa46904490
containers: Add a hostbridge and ipv6 addresses
...
This allows the containers to have their interface in a bridge on the host.
Also this adds IPv6 addresses to the containers both with bridged and unbridged
network.
2016-04-02 17:07:41 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Eelco Dolstra
4e356cefd7
Move the EC2 AMI registry from the NixOps repo
...
NixOps has infrequent releases, so it's not the best place for keeping
the list of current AMIs. Putting them in Nixpkgs means that AMI
updates will be delivered as part of the NixOS channels.
2016-03-31 14:16:51 +02:00
Franz Pletz
e5334ceca2
Merge pull request #14305 from benwbooth/xe-guest-utilities-6.2.0
...
xe-guest-utilities: init at 6.2.0
2016-03-31 10:12:42 +02:00
Eelco Dolstra
0d3738cdcc
Fix the EC2 test
...
We now generate a qcow2 image to prevent hitting Hydra's output size
limit. Also updated /root/user-data -> /etc/ec2-metadata/user-data.
http://hydra.nixos.org/build/33843133
2016-03-30 21:50:23 +02:00
Ben Booth
449d908b88
xe-guest-utilities: init at 6.2.0
...
use mkEnableOption
use sha256
add xe-guest-utilities to module-list.nix
2016-03-30 09:27:40 -07:00
Domen Kožar
e2e56a902f
fix eval
2016-03-30 16:43:36 +01:00
Domen Kožar
96be420e44
move growpart out of nixos into cloud-init package
2016-03-30 14:40:24 +01:00
Eelco Dolstra
5cc7bcda30
Combine OVA generation steps
...
Previously this was done in three derivations (one to build the raw
disk image, one to convert to OVA, one to add a hydra-build-products
file). Now it's done in one step to reduce the amount of copying
to/from S3. In particular, not uploading the raw disk image prevents
us from hitting hydra-queue-runner's size limit of 2 GiB.
2016-03-15 14:15:12 +01:00
Evgeny Egorochkin
cc947ef934
virtualization/azure: reorder WALA and SSHD
2016-03-13 13:57:31 +02:00
Evgeny Egorochkin
6f47b2c16d
virtualization/azure: turn off verbose logging
2016-03-13 13:57:31 +02:00
Evgeny Egorochkin
0d4e5649dc
virtualization/azure: make the image dynamic again since azure-cli upload bug is fixed
2016-03-13 13:57:30 +02:00
Evgeny Egorochkin
7a4684bee1
virtualization/azure: take entropy handling code out of WALA and execute it before SSHD generates the host keys
2016-03-13 13:57:30 +02:00
Cole Mickens
73487f4619
virtualization/azure: fixes
...
azure-agent: add option for verbose logging
azure-agent: disable ssh host key regeneration
azure-common: set verbose logging on
azure-image: increase size to 30GB
2016-03-13 13:57:30 +02:00
Rob Vermaas
ed5920ec65
Remove kill -9 -1 from initrd of amazon-image.nix. This causes a kernel panic.
2016-03-09 09:55:25 +00:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Evgeny Egorochkin
18d43d74f6
azure-image: provide configuration.nix which allows nixos-rebuild to build a working generation and add helpful comments
2016-03-03 04:03:07 +02:00
Tanner Doshier
4e5ef470a7
ec2-data: ensure providing a SSH host key is actually optional
...
2701665904
broke this.
2016-02-25 20:11:49 -06:00
zimbatm
cfa99e5a99
Merge pull request #13114 from colemickens/azure
...
azure: package qemu 2.2.0 to fix VHD creation
2016-02-23 22:47:44 +00:00
Cole Mickens
86cbd505c5
azure-agent: switch back to upstream WALinuxAgent
2016-02-18 21:11:21 -08:00
Cole Mickens
718848d5aa
azure: package qemu @ 2.2.0
...
This commit packages qemu-220. This package is qemu-2.2.0
and is only used with Azure.
2016-02-18 21:08:28 -08:00
Rob Vermaas
b2f2d2fef3
Fix azure image, by adding subformat=fixed to disk generation.
2016-02-17 12:02:52 +00:00
Vladimír Čunát
e9520e81b3
Merge branch 'master' into staging
2016-02-17 10:06:31 +01:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Eelco Dolstra
4d760edb94
Add FIXME
2016-02-09 16:15:57 +01:00
Rob Vermaas
fdbbcef8a2
Fix waagent revision, previous did not exist anymore.
2016-02-09 14:52:54 +00:00
Vladimír Čunát
a115bff08c
Merge branch 'master' into staging
2016-02-07 13:52:42 +01:00
Aneesh Agrawal
3c5fca9618
filesystems: use list of strings for fs options
...
Allow usage of list of strings instead of a comma-separated string
for filesystem options. Deprecate the comma-separated string style
with a warning message; convert this to a hard error after 16.09.
15.09 was just released, so this provides a deprecation period during
the 16.03 release.
closes #10518
Signed-off-by: Robin Gloster <mail@glob.in>
2016-02-06 19:48:30 +00:00
Eelco Dolstra
2701665904
Fetch all EC2 metadata / user data in the initrd
...
Since we're already fetching one datum, we may as well fetch the
others needed by fetch-ec2-data. This also eliminates the dependency
on wget.
2016-02-04 15:45:54 +01:00
Eelco Dolstra
5c72b20dde
amazon-init.nix: Be less spammy
2016-02-04 15:45:54 +01:00
Eelco Dolstra
95584666e9
amazon-init.nix: Don't run nixos-rebuild if we don't have to
2016-02-04 15:45:54 +01:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Guillaume Maudoux
9f358f809d
Configure a default trust store for openssl
2016-02-03 12:42:01 +01:00
Eelco Dolstra
e618492168
Revert "Do not relocate /nix and /tmp to small disks on AWS"
...
This reverts commit f10bead8fd
because
it doesn't work - there is no lsblk in the initrd, and there is a
missing backslash.
2016-02-02 19:59:28 +01:00