ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity
91,339 Commits 96 Branches 102 Tags 4.5 GiB
7a9dd489d6
Commit Graph

433 Commits

Author SHA1 Message Date
aszlig
4e23f1f908
nixos/virtualbox-image: Enable PAE on 32bit. 
pkgs/os-specific/linux/kernel/common-config.nix defines HIGHMEM64G on
line 441 for 32bit systems, which implies PAE.

We now creating the OVA with PAE support enabled, which fixes bootup of
the image if people are just importing it without setting PAE
explicitly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-09-17 12:31:59 +02:00
Matthias Beyer
a38d9d1ca8 nixos-container: Add bash completion for "nixos-container" command 2015-09-16 22:18:48 +02:00
Tobias Geerinckx-Rice
193319ce03 "Parallel Tools" -> Parallels Tools 2015-09-15 08:51:02 +02:00
William A. Kennington III
c2e4fb29c6 nixos/lxd: Add service 2015-09-13 23:27:31 -07:00
Luca Bruno
682777ed24 nixos containers: fix system path when reloading 2015-09-11 16:59:40 +02:00
Eelco Dolstra
c904dfa87c nixos-container: Fix show-host-key 
We don't generate ecdsa keys by default anymore, so print ed25519
instead if available.
 2015-09-08 15:57:49 +02:00
Ragnar Dahlén
9bfe92ecee docker: Minor improvements, fix failing test 
- Replace usage of deprecated CLI flag `--daemon`
- Introduce `storageDriver` option for module
- Fix failing test by using `overlay` storage driver
 2015-09-04 00:23:38 +01:00
Vladimír Čunát
54c4aab662 nixos: kill services.virtualboxGuest to fix #9600 2015-09-02 04:54:31 +02:00
Jaka Hudoklin
be1d6923a8 Merge pull request #9528 from offlinehacker/nixos/openvswitch/startup_fix 
openvswitch service: fix ipsec startup order
 2015-08-29 19:19:56 +02:00
Jaka Hudoklin
29c0262708 openvswitch service: fix ipsec startup order 2015-08-29 18:21:43 +02:00
Boris Sukholitko
ae80c3e7bc containers: fix interfaces option bugs 
The default should be [], no need to check it for INTERFACES
variable.
 2015-08-26 22:11:12 +03:00
Boris Sukholitko
77c49d9333 containers: add interfaces config option. 
It uses systemd-nspawn's --network-interface to move
existing interfaces into the container.
 2015-08-22 13:03:07 +03:00
aszlig
6440e9bbfd
nixos/vbox: Move all options to virtualisation.*. 
Commit 687caeb renamed services.virtualboxHost to programs.virtualbox,
but according to the discussion on the commit, it's probably a better to
put it into virtualisation.virtualbox instead.

The discussion can be found here:

https://github.com/NixOS/nixpkgs/commit/687caeb#commitcomment-12664978

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-08-13 12:28:24 +02:00
Eelco Dolstra
687caebfcb Rename services.virtualboxHost -> programs.virtualbox 
VirtualBox is an application, not a system service.
 2015-08-12 14:12:21 +02:00
Rob Vermaas
715e772667 Add initial Brightbox expression. 
(cherry picked from commit 55d9786289)
 2015-08-08 19:50:22 +00:00
aszlig
07edb2483d
Merge branch 'vboxguest-sbin-removal'. 
This removes all references to .../sbin for the guest additions and also
installs all binaries to .../bin instead (so no more .../sbin).

The main motivation for doing this is commit 98cedb3 (which
unfortunately had to be reverted in a9f2e10) and pull request #9063,
where the latter is an initial effort to move mount.vboxsf to .../bin
instead of .../sbin.

The commit I made afterwards is finishing the removal of .../sbin
entirely.
 2015-08-04 04:00:09 +02:00
aszlig
6c50714222
nixos: Give virtualbox-host.nix a better location. 
In 14f09e0, I've introduced the module under modules/programs, because
the legacy virtualbox.nix was also under that path. But because we
already have modules/virtualisation/virtualbox-guest.nix, it really
makes sense to put this module alongside of it as well.

This module thus has no change in functionality and I've tested
evaluation against nixos/tests/virtualbox.nix and the manual.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-08-04 03:59:52 +02:00
aszlig
86b695a18e
vbox-guest: Remove all references to sbin/. 
Using $storepath/sbin is deprecated according to commit 98cedb3, so
let's avoid putting anything in .../sbin for the guest additions.

This is a continuation of the initial commit done by @ctheune at
1fb1360, which unfortunately broke VM tests and only changed the path of
the mount.vboxsf helper.

With this commit, the VM test is fixed and I've also verified on my
machine that it is indeed working again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-08-04 03:03:24 +02:00
ts468
2b284a3d1d Merge pull request #8833 from ts468/upstream.xen 
xen: fixes (authored by michalpalka)
 2015-08-01 16:59:40 +02:00
Eelco Dolstra
65700b435c Use ConditionVirtualization to disable some services in containers 
(cherry picked from commit c52a983806)
 2015-07-22 12:23:40 +02:00
Mateusz Kowalczyk
23187c3431 docker: allow the user to override postStart 
My use-case: passing -H SOM.EIP.ADD.RES:PORT doesn't result in a .sock
file so the service would never go up.
 2015-07-20 14:28:49 +01:00
Thomas Strobel
2ff9129337 xen: fixes (authored by michalpalka) 
Xen required a few changes in order to be usable:
* Include xenfs module in initrd as loading it in the activation
  script was failing.
* Include /etc/default/xendomains, which is needed by
  xen-domains service.
* Create /var/log/xen and /var/lib/xen directories in
  the xen-store service, which are needed by the xl command.
  The directories could be created by any other script as long as
  they are guaranteed to exist before xl is called.
* Fix a reference to /bin/ls in the xendomains script.
 2015-07-15 12:38:37 +02:00
Luca Bruno
6c8e6aaa24 nixos docker: fix service and test 2015-07-05 13:57:23 +02:00
Mateusz Kowalczyk
2bd811155e Merge pull request #8603 from ts468/upstream.xen 
Xen related stuff
 2015-07-04 16:13:33 +01:00
Thomas Strobel
8f911263e9 Xen Dom0: add dnsmasq to xen-bridge. 2015-07-02 16:27:40 +02:00
Eelco Dolstra
96b325b0b7 Remove option ec2.metadata 2015-06-30 17:25:56 +02:00
Eelco Dolstra
32b9ca3219 EC2: Don't blackhole 169.254.169.254 
https://github.com/NixOS/nixops/issues/267
 2015-06-30 17:04:19 +02:00
William A. Kennington III
fee9ef8659 nixos: Replace pkgs.openssh with config.programs.ssh.package 2015-06-26 17:09:58 -07:00
Arseniy Seroka
cf44a27fc4 fix argument in mkEnableOption 2015-06-21 18:21:21 +03:00
Eelco Dolstra
f93d8425c3 Installer test: Fix booting from SCSI 
This is required by the GRUB 1 test.
 2015-06-17 15:47:43 +02:00
Dan Peebles
ebde5fd9d4 Use the right nix when doing things in our amazoninit 2015-06-13 21:26:50 -04:00
Thomas Strobel
399b549611 Fix: xen-bridge systemd service 2015-06-12 12:52:14 +02:00
Thomas Strobel
a6e12c23fc Link Xen scripts to /etc/xen 2015-06-12 12:52:14 +02:00
Dan Peebles
4b758e374e Initial attempt at configuring from EC2 userdata (with input from cstrahan). Now with VM tests! 2015-06-11 23:16:35 -04:00
Eelco Dolstra
d906939e74 Installer tests: Don't use the ISO 
We already have separate tests for checking whether the ISO boots
correctly, so it's not necessary to do that here. So now
tests/installer.nix just tests nixos-install, from a regular NixOS VM
that uses the host's Nix store. This makes running the tests more
convenient because we don't have to build a new ISO after every
change.
 2015-06-10 15:28:56 +02:00
Wout Mertens
0666ee4739 Merge pull request #6732 from oconnorr/master 
Use mktemp to create temporary files to hold ssh host keys and authorized keys
 2015-06-02 20:34:43 +02:00
William A. Kennington III
aa5d6922c5 Revert "Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config." 
The issue was that grub was not building the default entry which would
leave systems unbootable. This can now be safely reverted as the default
entry is being built once again.

This reverts commit fd1fb0403c.
 2015-05-29 13:26:51 -07:00
Russell O'Connor
29b7d76ec8 Remove use of && in fetch-ssh-keys service. 
Scripts are run with -e so will abort when a command fails.
 2015-05-29 19:53:58 +00:00
Russell O'Connor
4744e3541a [GCE] Put temp files for fetch-ssh-keys service in /run 2015-05-29 19:53:57 +00:00
Russell O'Connor
1badfabc4d Use mktemp to create temporary files to hold ssh host keys and authorized keys when downloading them from the metadata server. 2015-05-29 19:53:57 +00:00
Rob Vermaas
fd1fb0403c Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config. 2015-05-29 19:36:16 +00:00
Ian-Woo Kim
ae2279bcdb nixos-containers: bindMounts: change default to readOnly. use EXTRA_NSPAWN_FLAGS 2015-05-26 13:41:31 +00:00
Ian-Woo Kim
4d551227c9 nixos-container: rename extraBinds to bindMounts and use attribute set format. 2015-05-26 11:56:42 +00:00
Mateusz Kowalczyk
1113efec5e Merge pull request #7559 from offlinehacker/openvswitch/ipsec 
openvswitch: ipsec support
 2015-05-26 11:26:02 +01:00
Mateusz Kowalczyk
4fd0f2cf4d Merge pull request #7558 from offlinehacker/nixos/docker/typefix 
nixos/docker: set extraOptions to separatedString type
 2015-05-26 11:22:50 +01:00
Mateusz Kowalczyk
002c687edf nova-image: Delete no longer used comment 2015-05-26 11:05:52 +01:00
Mateusz Kowalczyk
0d454d863f Merge pull request #7876 from rzetterberg/issue-7869 
nixos: Fixes eval and build error of nova image builder
 2015-05-26 11:05:06 +01:00
Ian-Woo Kim
c4f66eb85d unify extraBindsRW/RO into extraBinds. Now arbitrary mount point is supported. 2015-05-25 19:09:53 +00:00
Ian-Woo Kim
cac38c8664 extraBindsRO/extraBindsRW 2015-05-24 16:31:59 +00:00
Evgeny Egorochkin
8ed3ab50ea azure-image: common: add sg3_utils 2015-05-20 13:25:01 +03:00
Evgeny Egorochkin
2fe9084397 azure-image: fix, split into bootstrap and regular configurations 
Conflicts:
	nixos/modules/virtualisation/azure-image.nix
 2015-05-20 13:24:38 +03:00
Bjørn Forsman
db991a4024 nixos/libvirtd: remove --verbose flag 
Because it spams the log:

  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_UPDATE_HANDLE: watch=874 events=13
  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_RUN: nhandles=24 timeout=-1
  .libvirtd-wrapp[1950]: EVENT_POLL_DISPATCH_HANDLE: watch=874 events=1
  .libvirtd-wrapp[1950]: OBJECT_REF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: [137B blob data]
 2015-05-20 12:14:18 +02:00
Bjørn Forsman
3d2d78cb39 nixos/libvirtd: add 'extraOptions' option 
And move the '--verbose' flag to extraOptions, so that users can easily
disable it.
 2015-05-20 12:14:18 +02:00
Richard Zetterberg
bd5011fc34 Fixes eval and build error of nova image builder 2015-05-17 20:55:07 +02:00
Jussi Maki
6a0d21eb86 VMWare guest support and open-vm-tools package 2015-05-15 12:43:21 +02:00
Rob Vermaas
650d3f8fc4 Revert restartIfChanged on fetch-ec2-data, as it breaks deployments that set ec2.metadata = true, as the existing (default) blackhole will not be cleared. 
(cherry picked from commit ccf672ca6b)
 2015-05-07 08:51:38 +00:00
Eelco Dolstra
4239e276ea fetch-ec2-data: Don't restart 
This service only needs to run once on system startup, so it doesn't
need to be restarted by switch-to-configuration.
 2015-05-04 16:56:46 +02:00
Rob Vermaas
ad0bd73775 Work around infinite recursion issue in nixops. 2015-04-29 09:55:20 +00:00
Jaka Hudoklin
ec6ecce8cf nixos/openvswitch: add ipsec gre tunnels support 2015-04-25 15:35:02 +02:00
Jaka Hudoklin
d6660af8ac nixos/docker: set extraOptions to separatedString type 
This change is needed if you want to pass extraOptions to docker in multiple
nixos modules.
 2015-04-25 15:25:15 +02:00
Eelco Dolstra
bad3211893 Disable some more unnecessary stuff in containers 2015-04-20 11:32:28 +02:00
Eelco Dolstra
1cb5583c05 container.nix -> docker-container.nix 2015-04-19 22:06:45 +02:00
Nicolas B. Pierron
9647a72835 Fix amazon default configuration.nix file. 2015-04-09 22:18:13 +02:00
Nicolas B. Pierron
6de931a0f8 Merge rename.nix changes. 2015-04-03 23:12:12 +02:00
William A. Kennington III
4868649f03 nixos/initrd: Generic library copying 2015-03-28 18:37:29 -07:00
Rob Vermaas
cbb14299c9 GCE image: Remove some unnecessary lib prefixes. 2015-03-26 09:15:09 +00:00
Rob Vermaas
80202fbd25 GCE image: Add some recommended sysctl settings. Disable OS level firewall by default for GCE images (GCE provides external firewall). Disable passwordAuthentication. Related to issue #6991. 2015-03-26 09:09:40 +00:00
lethalman
70b059fb59 Merge pull request #5936 from j-keck/nixos-container-usage 
nixos-container: add missing 'nixos-container update' in usage
 2015-03-17 12:43:29 +01:00
Shea Levy
3177d37652 Fix import using module args 2015-03-12 23:42:57 +01:00
Kirill Elagin
356810b178 cupsd: rename cupsd.service to cups.service 2015-03-12 09:00:56 +03:00
Eelco Dolstra
9bb586943a Deal with virtualisation.xen.stored in a more standard way 2015-03-05 12:46:50 +01:00
Luca Bruno
b93e8bab3a nixos/xen: do not use derivation in the default values 
The xen package is broken on i686, so this would break the generation
of the nixos manual.
 2015-03-04 12:05:58 +01:00
Eelco Dolstra
307064ceb5 Don't use machinectl to shut down containers 
If the host is shutting down, machinectl may fail because it's
bus-activated and D-Bus will be shutting down. So just send a signal
to the leader process directly.

Fixes #6212.
 2015-02-28 19:23:00 +01:00
Jaka Hudoklin
6dc0938a3e Merge pull request #6591 from lseppala/master 
Fix rebooting containers where resolv.conf is a symlink
 2015-02-28 12:19:01 +01:00
Joachim Fasting
0473b4ae8d nixos: citerefentry markup in lxc option descriptions 2015-02-28 09:21:48 +01:00
Lane Seppala
4106a3b74e Fix rebooting containers where resolv.conf is a symlink 2015-02-27 10:27:18 -07:00
Eelco Dolstra
22d2fc3657 Fix "systemctl reload container@" 
Fixes #5179.
 2015-02-27 14:32:54 +01:00
Rob Vermaas
24e0565407 Only start fetch-keys for GCE image after ip-up. 2015-02-27 10:48:15 +00:00
Rob Vermaas
e4928b8955 GCE image: Pass header to metadata service calls. 2015-02-26 19:20:43 +00:00
Thomas Strobel
3d4fbb874c Update: add new Xen versions + update NixOS Xen modules 
Versions of XEN:
- Xen 4.5
- Xen 4.5 + XenServer patches
- Xen 4.4.1
 2015-02-25 23:30:44 +01:00
Bjørn Forsman
97875ac175 bridge-utils: align attrname with pkgname 2015-02-20 22:30:51 +01:00
Eelco Dolstra
4ac280ec49 Blacklist the nouveau driver on EC2 2015-02-18 13:04:10 +01:00
James Cook
6daf9aa922 Merge pull request #5995 from ts468/qemu-vm 
Update QEMU Nixos Virtual Machine
 2015-02-16 13:13:26 -08:00
Thomas Strobel
80afabd5b5 Update QEMU Nixos Virtual Machine 
The Nixos Qemu VM that are used for VM tests can now start without
boot menu even when using a bootloader.
The Nixos Qemu VM with bootloader can emulate a EFI boot now.
 2015-02-16 20:07:42 +01:00
Evgeny Egorochkin
4621f16b34 azure: add a job to download ssh host and root keys if they are made available via "custom data"; see #3986 2015-02-16 16:54:30 +02:00
Rob Vermaas
824fccd3e9 Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable from nixops, without breaking evaluation for other backends. 
(cherry picked from commit 213fe8427c)
 2015-02-16 09:57:19 +00:00
Eelco Dolstra
378006f0f2 Restrict the length of container names 2015-01-28 16:13:00 +01:00
Jaka Hudoklin
2af3ff52c2 nixos/containers: make containers in containers possible 2015-01-28 16:06:44 +01:00
j-keck
611a21a919 nixos-container: add missing 'nixos-container update' in usage 
* in nixos-container.pl the mode 'update' is missing in the usage
 2015-01-24 20:37:55 +01:00
Eelco Dolstra
efa8fc2b0a Paranoia 2015-01-15 18:37:55 +01:00
Eelco Dolstra
3ca275d7ba NixOS containers: Create /root with 700 permission 
Systemd-nspawn creates /root with 755 permission if it doesn't exist,
which is bad. So we have to create it ourselves before calling
systemd-nspawn.
 2015-01-15 17:51:43 +01:00
Rob Vermaas
df7923fa82 Merge pull request #5515 from oconnorr/master 
GCE updates to ntp server and to fetch all ssh keys
 2015-01-14 13:19:38 +01:00
mokasin
dd6dfde575 Add auto-start option to containers. 2015-01-12 18:26:22 +01:00
Russell O'Connor
d1a58ef7c6 google-compute-image.nix: Try to download all SSH host keys from metadata server. 2015-01-06 12:06:54 -05:00
Russell O'Connor
3251948029 Generate SSH host public key from the private key. 2015-01-05 15:20:55 -05:00
Russell O'Connor
d1cbbff1e3 Call wget directly in fetch-ssh-keys service. 2015-01-05 15:20:55 -05:00
Russell O'Connor
6382e16014 google-compute-image.nix: unconditionally clean up /root/key.pub /root/authorized-keys-metadata 2015-01-05 15:18:02 -05:00
Russell O'Connor
b19ab1f046 google-comute-image.nix: set umask 077 when downloading private keys from the metadata server. 2015-01-05 15:01:49 -05:00
Russell O'Connor
e548a4330d google-compute-image.nix: use internal google NTP server. 2015-01-05 12:45:23 -05:00
Rob Vermaas
ea9530b5c7 Fix GCE image build. 
(cherry picked from commit 98af87cd4a)
 2015-01-05 09:35:35 +01:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Mathijs Kwik
6e728a42ec virtualisation.qemuNetworkingOptions -> virtualisation.qemu.networkingOptions 2014-12-19 11:59:00 +01:00
Mathijs Kwik
6cdacdd4a2 nixos/qemu-vm: make networking options configurable 2014-12-19 08:52:06 +01:00
Jaka Hudoklin
4be1089781 nixos: move kubernetes & fleet to services/cluster 2014-12-11 23:32:37 +01:00
Jaka Hudoklin
deb28cf0b1 nixos: container tarball release 
- Create container nixos profile
- Create lxc-container nixos config using container nixos profile
- Docker nixos image, use nixos profile for its base config
 2014-12-11 23:17:27 +01:00
Jaka Hudoklin
c821f239a3 nixos/fleet: fix typo 2014-12-08 13:30:45 +01:00
Jaka Hudoklin
743b47579b nixos/fleet: enable etcd and docker by default 2014-12-08 13:07:12 +01:00
Jaka Hudoklin
b7092dc95c nixos: add fleet module 2014-12-07 21:52:52 +01:00
Domen Kožar
55cf272c19 fixes #5198 2014-12-02 12:59:14 +01:00
Jaka Hudoklin
40d73c5eb7 nixos/docker: fix module, add simple test 2014-12-01 17:20:35 +01:00
Jaka Hudoklin
2b261c1edf nixos: add kubernetes module 2014-11-29 02:27:17 +01:00
aszlig
444987193e
nixos: Rename virtualbox to virtualboxGuest. 
Especially new users could be confused by this, so we're now marking
services.virtualbox.enable as obsolete and defaulting to
services.virtualboxGuest.enable instead. I believe this now makes it
clear, that this option is for guest additions only.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-27 18:42:22 +01:00
Aristid Breitkreuz
5ff169f4d7 containers: remove obsolete comment 2014-11-23 12:30:03 +01:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Michael Raskin
232f6bb4d2 Merge pull request #4929 from abbradar/prl-tools 
Add packages and support for Parallel Guest Tools
 2014-11-13 00:22:42 +03:00
Michael Raskin
efe5eb4709 Merge pull request #4573 from fpletz/feature/lxc-configuration 
Add support for global LXC config files
 2014-11-13 00:14:46 +03:00
Nikolay Amiantov
32e18bc722 nixos/parallels-guest: add options 2014-11-12 01:26:23 +03:00
Luca Bruno
83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Jaka Hudoklin
53667c7b1a Merge pull request #4870 from bosu/docker-proxy 
docker: propagate nix.proxy into daemon environment
 2014-11-08 13:06:56 +01:00
Boris Sukholitko
0d89afdedd docker: propagate nix.proxy into daemon environment 2014-11-07 13:46:36 +02:00
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
aszlig
8e516de3e7
nixos: Fix priorities of initialHashedPassword. 
Regression introduced in f496c3cbe4.

Previously when we used security.initialRootPassword, the default
priority for this option was 1001, because it was a default value set by
the option itself.

With the mentioned commit, it is no longer an option default but a
mkDefault, which is priority 1000.

I'm setting this to 150 now, as test-instrumentation.nix is using this
for overriding other options and because I think it still makes it
possible to simple-override it, because if no priority is given, we get
priority 100.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-04 05:19:07 +01:00
Eelco Dolstra
f496c3cbe4 Obsolete security.initialPassword 
You can now set users.extraUsers.root.initialHashedPassword instead.
 2014-11-03 12:36:56 +01:00
Franz Pletz
2c321bf296 Add support for global LXC config files 2014-10-18 05:02:39 +02:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Mathnerd314
938f92e8b2 Fix the driver for qemu ("vesa" -> "modesetting") 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-10-15 12:24:50 +02:00
Rob Vermaas
8523d0e44c Dohh 
(cherry picked from commit b7451d91e8)
 2014-10-14 11:43:51 +02:00
Rob Vermaas
028807c3a0 amazon-image.nix: Pass --option build-users-group '' to nix tools to make Amazon generation work with nix-1.8+ 
(cherry picked from commit 654eaeb2ca)
 2014-10-14 11:40:04 +02:00
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Bjørn Forsman
0bfd27535f nixos/libvirtd: refresh LXC emulator path on startup 
This fixes the issue when the LXC emulator binary is garbage collected
and breaks libvirtd containers, because libvirtd XML file still refers
to GC'ed store path.

We already have a fix for QEMU, this commit extends the fix to cover LXC
too.
 2014-09-15 23:03:20 +02:00
Vladimír Čunát
d957b4bd78 Merge recent master into staging 
Hydra nixpkgs: ?compare=1151601
 2014-09-13 21:48:29 +02:00
aszlig
d394d095ab
containers: Don't descend into mounts on destroy. 
This tells the sad tale of @the-kenny who had bind-mounted his home
directory into a container. After doing `nixos-container destroy` he
discovered that his home directory went from "full of precious data" to
"no more data".

We want to avoid having similar sad tales in the future, so this now also
check this in the containers VM test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-09-11 18:12:35 +02:00
aszlig
859f049d1b
containers: Remove check for var/lib/startup-done. 
Fixes a leftover from 330fadb706.

We're using systemd dbus notifications now and this leftover caused the
startup notification to fail.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-09-11 18:12:35 +02:00
Eelco Dolstra
152ae27aac Merge remote-tracking branch 'origin/systemd-216' into staging 2014-09-08 13:53:33 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging' 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2014-09-08 11:42:09 +02:00
Rob Vermaas
f14d1d76bb Azure: Fix authorized_keys 2014-09-06 22:54:15 +02:00
Rob Vermaas
e9c1fb0c89 Azure: Mount metadata 'CD' on /metadata 2014-09-06 21:53:10 +02:00
Rob Vermaas
81046b9e5d Initial configuration + image generation script for Micro$oft Azure. Work in progress for #3986. 2014-09-06 21:37:46 +02:00
Vladimír Čunát
06fea81c6e Merge recent master into staging 
Hydra: ?compare=1150594
 2014-09-06 16:52:45 +02:00
Luca Bruno
718106e958 Fix initrd after recent busybox upgrades 2014-09-05 18:42:53 +02:00
Jaka Hudoklin
43d9f92c82 nixos: docker, create docker group 2014-09-03 21:23:30 +02:00
Eelco Dolstra
3d821c068a Merge remote-tracking branch 'origin/master' into systemd-216 2014-09-02 14:43:27 +02:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02:00
Chris Farmiloe
08534000a4 Ensure libvirtd is started after vswitch and add ability to configure how libvirtd guests are shutdown 2014-09-02 01:48:50 +04:00
Chris Farmiloe
76a4de68c1 formatting/retab 2014-09-02 01:48:50 +04:00
Chris Farmiloe
8ef11bb0ee add openvswitch package + basic nixos module to enable it 2014-09-02 01:48:50 +04:00
Michael Raskin
d140851472 Merge pull request #3779 from offlinehacker/docker 
full nixos inside docker
 2014-09-02 01:04:05 +04:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Eelco Dolstra
21ab4e054c nixos-container run: Execute command using ‘su’ 
This ensures that the environment is set up correctly.
 2014-08-28 02:20:31 +02:00
Eelco Dolstra
6773babd5b Containers: Use nsenter to execute commands in containers 
Also remove ‘nixos-container set-root-password’, which is kind of
pointless now.
 2014-08-28 02:20:23 +02:00
Jaka Hudoklin
296888b1bc nixos: virtualisation, add basic docker nixos image 2014-08-25 12:00:14 +02:00
Eelco Dolstra
0263a8f860 NixOS containers: Use exit status 133 for reboots 2014-08-24 12:28:41 +02:00
Vladimír Čunát
d4e9fd2a90 Merge recent master into staging 
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
 2014-08-21 15:09:31 +02:00
Eelco Dolstra
b18f503f1a nixos-container: Add command show-host-key 
This is used by nixops.
 2014-08-19 18:24:48 +02:00
Eelco Dolstra
ddd8f0cf66 nixos-container --create: Add option --system-path 
This allows creating a container from an existing system store path,
which is especially nice for NixOps-deployed hosts because they don't
need a Nixpkgs tree anymore.
 2014-08-19 18:24:44 +02:00
Eelco Dolstra
23db49cf98 Containers: Fix all-containers.service start 
Fixes #3662.
 2014-08-19 10:06:48 +02:00
Eelco Dolstra
2c899859bf Containers: Use systemd startup notification 
Systemd in a container will call sd_notify when it has finished
booting, so we can use that to signal that the container is
ready. This does require some fiddling with $NOTIFY_SOCKET.
 2014-08-18 17:16:13 +02:00
Eelco Dolstra
11d99048c1 Containers: Use systemd-nspawn startup notification 2014-08-18 17:14:55 +02:00
Eelco Dolstra
ceb67cc9ef Containers: Clean up veth interfaces 2014-08-18 17:14:49 +02:00
Eelco Dolstra
a7a08188bf Containers: Don't remount / 2014-08-18 17:14:43 +02:00
Eelco Dolstra
32b977d4a7 Containers: Fix reboot and poweroff 
Previously "machinectl reboot/poweroff" brutally killed the container,
as did "systemctl stop/restart". And reboot didn't actually work. Now
everything is fine.
 2014-08-18 17:14:38 +02:00
Eelco Dolstra
b10a3e9145 nixos-container: Allow auto-starting containers 2014-08-18 17:11:07 +02:00
Eelco Dolstra
2337a85fc3 Autostart containers at boot time 2014-08-18 17:09:42 +02:00
Eelco Dolstra
e7860f04c2 nixos-container: Add status command 2014-08-18 17:09:35 +02:00
Eelco Dolstra
e620be97fe Containers: Set up /etc/resolv.conf 
Systemd-nspawn is supposed to do this, but doesn't if any of the
--network-* flags are used.
 2014-08-15 04:06:01 +02:00
Eelco Dolstra
e6c00e60c3 nixos-container destroy: Make idempotent 2014-08-15 04:06:01 +02:00
Eelco Dolstra
df7bc53606 Merge remote-tracking branch 'origin/master' into staging 2014-08-15 02:15:14 +02:00
Eelco Dolstra
883fa4f920 nixos-container destroy: Remove gcroots 2014-08-15 02:14:27 +02:00
Eelco Dolstra
330fadb706 Containers: Use systemd-nspawn startup notification 
This prevents the container unit startup from hanging until timeout if
systemd-nspawn fails.
 2014-08-13 00:49:25 +02:00
Eelco Dolstra
878b738333 Containers: Clean up veth interfaces 2014-08-12 03:13:32 +02:00
Eelco Dolstra
b99af5579e Containers: Don't remount / 2014-08-12 03:13:32 +02:00
Eelco Dolstra
04ec038e89 Containers: Fix reboot and poweroff 
Previously "machinectl reboot/poweroff" brutally killed the container,
as did "systemctl stop/restart". And reboot didn't actually work. Now
everything is fine.
 2014-08-12 03:13:31 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Rob Vermaas
46205faf69 Fix evaluation in virtualbox-image.nix 2014-08-06 16:25:42 +02:00
Rickard Nilsson
534a01c2b0 amazon ec2: Make fetch-ec2-data more robust 
curl does not retry if it is unable to connect to the metadata server.
For some reason, when creating a new AMI with a recent nixpkgs, the
metadata server would not be available when fetch-ec2-data ran. Switching
to wget that can retry even on TCP connection errors solved this problem.

I also made the fetch-ec2-data depend on ip-up.target, to get it to start
a bit later.
 2014-08-05 15:12:26 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Rickard Nilsson
ced7fc37c2 virtualbox-image: Make the image size configurable 2014-08-04 11:29:51 +02:00
Shea Levy
fb565f1a4e amazon-image.nix: Overwrite busybox swapon 2014-08-01 17:55:37 -04:00
Rob Vermaas
3566807e76 Google Compute image: 
Removed the 'wait for GCE metadata service' job, as it was causing
issues with the metadata service (likely some firewall or something).
In stead, use wget with retries (including connection refused) in
stead or curl for fetching the SSH keys. Also made the stdout/-err
of this job appear in the console.
 2014-08-01 15:25:50 +02:00
Eelco Dolstra
e68b0c7f5f Mount unionfs-fuse filesystems using the normal fileSystems option 2014-07-30 16:04:15 +02:00
Paul Colomiets
9bc1676e5a Upgrade docker to 1.1.2 and add docker module 
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
 2014-07-28 21:45:49 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Evgeny Egorochkin
2660e19b73 Google Compute config: add a unit to wait for the metadata server to become available 2014-07-20 14:07:46 +03:00
Shea Levy
654c88cc6b Fix virtualbox image building with new nix 2014-07-15 19:17:06 -04:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Evgeny Egorochkin
64c01fdf81 Google Compute Image: fetch host keys if possible 2014-07-12 08:47:03 +03:00
Evgeny Egorochkin
9d8ddd465d Google Compute Image needs the interface to be named eth0 for google tools to work properly 2014-07-12 08:47:03 +03:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Shea Levy
b3cfb9084b Get all lib functions from lib, not pkgs.lib, in modules 2014-07-02 12:28:18 -04:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Rob Vermaas
04e648f789 Change size of Amazon EC2 S3-backed images to 8GB (was 4GB). 
(cherry picked from commit 05543ef6e0)
 2014-06-19 11:28:06 +02:00
Rob Vermaas
fe3a63b7d0 EC2: allow building S3-backed HVM ami's 
(cherry picked from commit e007559e95)
 2014-06-19 10:57:26 +02:00
Moritz Ulrich
f6d03359b3 Only overwrite container-configuration when --config is specified. 
Fixes #2834.
 2014-06-06 11:49:16 +02:00
Luca Bruno
b0234f216c Fix passing extra qemu opts when using boot loader 2014-05-25 21:37:02 +02:00
Rob Vermaas
3da94435c0 Add option ec2.hvm, to set some boot configuration specific for EC2 HVM instances. 
(cherry picked from commit 35c76d9173)

Conflicts:
	nixos/modules/virtualisation/amazon-image.nix
 2014-05-21 16:37:53 +02:00
Rob Vermaas
7d3dcd9a8c Set console=ttyS0 for Amazon EC2 instances, as suggested by Amazon. 2014-05-12 12:29:04 +02:00
Eelco Dolstra
253bbb8e2b nixos-container: Ensure umask 022 
Fixes #2585.
 2014-05-09 13:26:02 +02:00
Eelco Dolstra
4fc151b5a3 nixos-install: Ask the user to set a root password 
This removes the need to have an initially empty root password.
 2014-05-09 00:52:02 +02:00
Eelco Dolstra
333bfe16c4 Containers: Support setting up macvlan interfaces 
By setting a line like

  MACVLANS="eno1"

in /etc/containers/<name>.conf, the container will get an Ethernet
interface named mv-eno1, which represents an additional MAC address on
the physical eno1 interface. Thus the container has direct access to
the physical network. You can specify multiple interfaces in MACVLANS.

Unfortunately, you can't do this with wireless interfaces.

Note that dhcpcd is disabled in containers by default, so you'll
probably want to set

  networking.useDHCP = true;

in the container, or configure a static IP address.

To do: add a containers.* option for this, and a flag for
"nixos-container create".
 2014-05-07 17:53:57 +02:00
Eelco Dolstra
6f7aaf10a5 Containers: Use systemd-nspawn's --network-veth flag 
Note that this causes the name of the host-side interface to change
from c-<name> to ve-<name>.
 2014-05-07 17:53:57 +02:00