Eelco Dolstra
7a382679e4
Revert 434260c772
...
There is a bug in unionfs, but it only manifested itself because of
our accidental use of stage-1 libraries in stage-2.
2013-01-23 14:46:54 +01:00
Eelco Dolstra
ef5108f560
Fix registering valid paths in VM tests
...
Commit 37b56574e2
revealed that the code
to get regInfo from /proc/cmdline was broken. It only happened to
work because the kernel passes the command line to stage 1 through the
environment, so $regInfo was set anyway.
2013-01-23 14:35:52 +01:00
Eelco Dolstra
434260c772
Work around a bug in unionfs
...
Unionfs cannot delete directories that contain open deleted files.
This broke a Nix test.
http://hydra.nixos.org/build/3843354
2013-01-22 18:18:05 +01:00
Eelco Dolstra
fc14a31f2c
unionfs: Increase the open file limit
...
The default (1024) is way too low, e.g. to start KDE on the
installation CD.
2013-01-22 13:31:08 +01:00
Eelco Dolstra
1aaa726e75
Merge remote-tracking branch 'origin/systemd'
2013-01-21 12:45:50 +01:00
Eelco Dolstra
ae4e94d9ac
Rename ‘boot.systemd’ to ‘systemd’
...
Suggested by Mathijs Kwik. ‘boot.systemd’ is a misnomer because
systemd affects more than just booting. And it saves some typing.
2013-01-16 12:33:18 +01:00
Rob Vermaas
207d30b6f3
Fix VirtualBox image generation: switch-to-configuration in chroot needs /bin/sh
2013-01-04 10:58:56 +01:00
Tim Dysinger
6961f5048d
add vboxsf group (for automatic mounting of shared folders)
2012-12-31 11:00:02 -10:00
Shea Levy
3ef1432866
Update create-s3-amis and amazon-image.nix to recent nixos
2012-12-18 13:44:47 -05:00
Shea Levy
75ec5c609e
Merge remote-tracking branch 'upstream/master' into systemd
...
Conflicts:
maintainers/scripts/ec2/create-ebs-amis.py
2012-12-17 13:03:56 -05:00
Shea Levy
ae4c8e3e0b
nova-image.nix: Replace the commented-out aufs mount with a commented-out unionfs-fuse mount
2012-12-16 13:31:44 -05:00
Shea Levy
ac9002ce18
amazon-image: use unionfs-fuse instead of aufs
2012-12-16 13:16:17 -05:00
Shea Levy
d19c223ba6
Simplify unionfs-chroot bind-mounting
2012-12-16 13:07:42 -05:00
Shea Levy
e34024d998
Refactor common unionfs-fuse initrd prep into a separate module
2012-12-16 12:33:36 -05:00
Lluís Batlle i Rossell
3e734ba695
Qemu says 'boot=on' is deprecated, so I try a half-fix here
...
I change the 'build-vm' to use '-boot menu=on', so a menu displays and allows
choosing the 2nd hd. Otherwise, I don't know how to boot from a 2nd hd.
2012-12-16 18:07:13 +01:00
Shea Levy
3eb0faf317
qemu-vm: Use unionfs-fuse instead of aufs for writableStore
2012-12-16 11:56:49 -05:00
Eelco Dolstra
b1da38f564
Merge remote-tracking branch 'origin/master' into systemd
2012-11-30 16:12:04 +01:00
Rob Vermaas
f0a6911929
Add ec2.metadata (default false) option whether to allow access to EC2 metadata API.
2012-11-21 12:19:38 -05:00
Eelco Dolstra
458f36f5f1
Turn fileSystems into an attribute set
...
So now you can write
fileSystems =
[ { mountPoint = "/";
device = "/dev/sda1";
}
];
as
fileSystems."/".device = "/dev/sda1";
2012-11-02 18:02:12 +01:00
Eelco Dolstra
97f087cd44
Turn networking.interfaces into an attribute set
...
Thus
networking.interfaces = [ { name = "eth0"; ipAddress = "192.168.15.1"; } ];
can now be written as
networking.interfaces.eth0.ipAddress = "192.168.15.1";
The old notation still works though.
2012-11-02 17:08:11 +01:00
Eelco Dolstra
6ae0b3beed
dhcpcd: Don't use --background so that fetch-ec2-data can be ordered after it
2012-11-02 14:20:05 +01:00
Eelco Dolstra
4764848314
Remove some obsolete options
2012-10-29 21:10:00 +01:00
Eelco Dolstra
65eae4dd34
Update libvirt for systemd
2012-10-26 16:22:19 +02:00
Eelco Dolstra
1c53b2e299
Don't flush addresses unless necessary
...
Flushing is bad if the Nix store is on a remote filesystem accessed
over that interface.
http://hydra.nixos.org/build/3184162
Also added a interface option ‘prefixLength’ as a better alternative
to ‘subnetMask’.
2012-10-11 15:36:52 -04:00
Eelco Dolstra
ad94b9e50e
Use optionalAttrs
2012-10-10 16:49:47 -04:00
Eelco Dolstra
98c6c5b730
fetch-ec2-data: Update for systemd
2012-10-04 23:26:19 -04:00
Eelco Dolstra
b02c488fde
Automatically append ".service" to the name of service units
2012-08-23 10:25:27 -04:00
Eelco Dolstra
08f14b33c1
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-08-20 11:27:38 -04:00
Eelco Dolstra
a025e7e7e2
Provide a common share between VMs to allow easy communication
...
Every VM now mounts a common SMB share on /tmp/shared.
2012-08-16 10:47:33 -04:00
Eelco Dolstra
5ae6385175
qemu-vm.nix: Use ext4 instead of ext3
2012-08-09 10:00:49 -04:00
Shea Levy
9d8ddd90f9
qemu mounts /nix/store via CIFS
2012-08-07 16:44:15 -04:00
Shea Levy
13d8856a4f
qemu requires VIRTIO_NET (and dependencies) for virtio networking
2012-08-07 16:25:11 -04:00
Shea Levy
805d37db48
qemu-vm creates an ext3 filesystem
2012-08-07 07:02:08 -04:00
Shea Levy
11e5207a2d
qemu requires VIRTIO_BLK (and dependencies) for virtio drives
2012-08-06 17:10:54 -04:00
Eelco Dolstra
27f496c1ce
Make the VirtualBox guest services depend on /dev/vboxguest
...
Systemd #ftw
2012-08-06 14:59:58 -04:00
Shea Levy
e66bcbd58a
The kernel needs SERIAL_8250_CONSOLE when using a real serial port as a console
2012-08-06 08:13:06 -04:00
Eelco Dolstra
16da4a14f1
amazon-image.nix: Don't put any old configurations in the GRUB menu
2012-07-25 16:38:05 -04:00
Eelco Dolstra
b3b6b8ad60
virtualbox-image.nix: VirtualBox disks are /dev/sda, not /dev/vda
2012-07-24 19:07:03 -04:00
Eelco Dolstra
5a0cf5e7b6
Use ext4 for VirtualBox images
2012-07-23 14:01:10 -04:00
Eelco Dolstra
7613ae950a
Fix booting on EC2
...
The kill command in ash doesn't know the "--" syntax, but doesn't need
it either.
2012-06-24 19:02:34 -04:00
Eelco Dolstra
9692495df0
Use BusyBox in the initrd
...
Using BusyBox instead of Bash plus a bunch of other tools gives us a
much more feature-full, yet smaller initrd. In particular, BusyBox
contains networking commands such as ip and a DHCP client, useful for
NFS boots. It's also much more convenient for rescue situations
because the shell has builtin readline support and there are many more
tools (including vi).
2012-06-22 10:43:06 -04:00
Eelco Dolstra
a3118792a5
* Make the ACPI Shutdown command in VirtualBox to do the right thing.
...
svn path=/nixos/trunk/; revision=34473
2012-06-11 22:37:55 +00:00
Lluís Batlle i Rossell
a257bf78cb
Making the virtualbox-guest module be evaluated only in i686 and x86_64.
...
On mips, an assertion in the nixpkgs virtualbox was failing.
svn path=/nixos/trunk/; revision=34464
2012-06-11 17:31:03 +00:00
Eelco Dolstra
9dadfc3541
* Mark QEMU VMs as NixOS machines.
...
svn path=/nixos/trunk/; revision=34217
2012-05-23 15:40:31 +00:00
Eelco Dolstra
3b314fa40b
* Include cryptsetup in EC2 AMIs.
...
svn path=/nixos/trunk/; revision=34096
2012-05-14 23:43:38 +00:00
Eelco Dolstra
03f2847054
* Set preferLocalBuild on a few trivial top-level derivations. These
...
tend to cause a lot of unnecessary I/O to the build machines.
svn path=/nixos/trunk/; revision=33936
2012-04-26 15:19:23 +00:00
Eelco Dolstra
fa50d105d7
* Pass -cpu kvm64 in NixOS VMs (and add a simple regression test for
...
GMP).
svn path=/nixos/trunk/; revision=33849
2012-04-19 18:56:35 +00:00
Eelco Dolstra
43f43fd185
* Only stop libvirt-guests automatically on system shutdown.
...
Saving/restoring VMs is disruptive.
svn path=/nixos/trunk/; revision=33844
2012-04-19 15:12:55 +00:00
Eelco Dolstra
2821289aeb
* Ugly hack: force udev to exit to prevent random "Device or resource
...
busy while trying to open /dev/xvda" errors from fsck.
svn path=/nixos/trunk/; revision=33766
2012-04-12 18:01:19 +00:00
Eelco Dolstra
185e9b69ed
* Assume that the ephemeral devices are called /dev/xvda-e. So
...
in Charon deployments, non-ephemeral devices should be >= /dev/xvdf.
svn path=/nixos/trunk/; revision=33764
2012-04-12 16:48:01 +00:00