739b046784
Merge pull request #130178 from NixOS/backport-129978-to-release-21.05
2021-08-06 20:05:54 +03:00
2194711ae0
nixos/virtualbox-image: cast baseImageFreeSpace into str
...
This fixes an evaluation error that's blocking the nixos-unstable
channel (#132328 ).
(cherry picked from commit b5fab53628e8f080bae24ea1396f72d9d21e1f9b)
2021-08-03 02:47:14 +02:00
a2a5df1e63
vbox-image: add new option to set free space in image
...
(cherry picked from commit a6700d75f38cda83367a8af84651a2a72ce0f3ef)
2021-08-03 02:45:28 +02:00
6526d0e5c3
Only include ipsecTools if using ipsec
...
(cherry picked from commit adc368d2fc7dd74beb8486ff72880ed0212abb0d)
2021-07-27 19:46:56 +02:00
94f0dea33b
open-vm-tools: Copy the udev files over correctly
...
(cherry picked from commit 42ea61bc7dacc8360eb87152635f5f14f003c18d)
2021-07-14 13:18:01 +00:00
77e8ea81e3
ec2-amis: add release 21.05
...
(cherry picked from commit b7d74194b49c3b3f85d52e85054283211bce6c11)
2021-06-06 17:09:30 -07:00
0684f78698
nixos/podman-network-socket-ghostunnel: move condition to include socket
...
(cherry picked from commit 72f54c32a6114a69caec30170a29837c91434aff)
2021-06-02 10:20:11 +02:00
c758b69375
nixos/podman-dnsname: init
...
(cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)
2021-06-02 10:20:11 +02:00
9e4729617b
nixos/podman: Add defaultNetwork.extraPlugins
...
(cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)
2021-06-02 10:20:11 +02:00
f28df17dfa
nixos/containers: Add virtualisation.containers.containersConf.cniPlugins
...
(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
2021-06-02 10:20:11 +02:00
833b005e37
nixos/podman-network-socket-ghostunnel: init
...
(cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)
2021-06-02 10:20:10 +02:00
ffde2bb4a1
nixos/podman: Add generic networkSocket interface
...
(cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)
2021-06-02 10:20:10 +02:00
0c5e6d0bea
nixos/podman: Add dockerSocket.enable
...
(cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)
2021-06-02 10:20:10 +02:00
db05ed8b0d
nixos/podman: Change podman socket to new podman group
...
(cherry picked from commit fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc)
2021-06-02 10:20:10 +02:00
f63aff597b
nixos/podman: install cni config from package
...
(cherry picked from commit 30ae7e4ba983de461c7b71d02274d184ab55244d)
2021-06-02 10:20:10 +02:00
4f9eadefdc
Update nixos/modules/virtualisation/libvirtd.nix
...
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
(cherry picked from commit 964fc7cfef94bd598d816979a4ca1a42d9753d23)
2021-05-30 14:56:41 +00:00
c072a18797
nixos/libvirtd: Take ethertypes from iptables-nftables-compat
...
iptables is currently defined in `all-packages.nix` to be
iptables-compat. That package does however not contain `ethertypes`.
Only `iptables-nftables-compat` contains this file so the symlink
dangles.
(cherry picked from commit 2eeecef3fc70e35b2f4c6d8424e4c726c140e330)
2021-05-30 14:56:41 +00:00
9cab80ce4d
Merge pull request #122203 from mohe2015/imperative-nixos-container-timeout
...
nixos-containers: Increase startup timeout for imperative containers
2021-05-22 23:04:12 +02:00
5b4915fb7a
Merge pull request #110927 from Izorkin/fix-qemu-ga
...
nixos/qemu-guest-agent: fix start service
2021-05-19 05:42:06 +01:00
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
...
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
7e310dd8e8
nixos/containerd: StartLimit* options must be in the unit-section
...
also, raise limits to ensure reasonable startup time, now that StartLimits are actually enforced
2021-05-17 06:17:18 +10:00
2142f88526
nixos/containerd: sanitize StateDirectory and RuntimeDirectory
2021-05-17 06:17:18 +10:00
39e3f7c2cc
Merge master into staging-next
2021-05-13 18:32:50 +00:00
ca6255bf0b
nixos/docker: fix evaluation when NAT is enabled too
...
Both networking.nat.enable and virtualisation.docker.enable now want to
make sure that the IP forwarding sysctl is enabled, but the module
system dislikes that both modules contain this option.
Realistically this should be refactored a bit, so that the Docker module
automatically enables the NAT module instead, but this is a more obvious
fix.
2021-05-13 10:26:45 +00:00
bc1f4b790e
Merge master into staging-next
2021-05-09 12:23:16 +00:00
7a80d281ed
nixos/containers: Increase startup timeout for imperative containers
...
Changed the startup timeout from 15 seconds to one minute as 15 seconds is really low.
Also it's currently not possible to change it without editing your system configuration.
2021-05-08 19:59:20 +02:00
9317570735
nixos/docker: ensure ipv4 forwarding is enabled
...
Fixes #118656
2021-05-08 18:58:24 +01:00
77c79724e3
Merge staging-next into staging
2021-05-04 06:20:26 +00:00
37e2fbda39
Merge pull request #121449 from endgame/metadata-fetcher-umask
...
metadata fetchers: use umask instead of fetch-and-chmod
2021-05-04 03:39:38 +02:00
5e177b16b1
Merge staging-next into staging
2021-05-03 18:25:49 +00:00
a0da004326
Merge pull request #121376 from urbas/amazon-init-shell-script-support
...
nixos/amazon-init: add user-data shell script support
2021-05-03 16:01:26 +01:00
5ea55e4ed0
metadata fetchers: use umask instead of fetch-and-chmod
2021-05-02 08:28:59 +10:00
ef6416a6ba
Merge staging-next into staging
2021-05-01 00:54:32 +00:00
44a0debca7
Merge pull request #121021 from pennae/container-sigterm
...
nixos/nix-containers: use SIGTERM to stop containers
2021-04-30 21:35:16 +02:00
ae02415ee8
treewide: remove gnidorah
...
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
01105a117a
Merge staging-next into staging
2021-04-29 06:21:55 +00:00
ce93de4f62
nixos/hyperv: bail gracefully if device is missing
2021-04-29 09:37:17 +08:00
82931ea446
nixos/nix-containers: use SIGTERM to stop containers
...
systemd-nspawn can react to SIGTERM and send a shutdown signal to the container
init process. use that instead of going through dbus and machined to request
nspawn sending the signal, since during host shutdown machined or dbus may have
gone away by the point a container unit is stopped.
to solve the issue that a container that is still starting cannot be stopped
cleanly we must also handle this signal in containerInit/stage-2.
2021-04-28 14:07:35 +02:00
e30742adc3
Merge staging-next into staging
2021-04-26 12:06:35 +00:00
ee04d772e4
Merge pull request #120489 from samueldr/fix/make-disk-image-auto-size
...
Fix make disk image automatic size
2021-04-26 10:34:15 +02:00
1626c4772a
Merge staging-next into staging
2021-04-25 12:06:12 +00:00
c648f7ee2a
Merge master into staging-next
2021-04-25 13:54:29 +02:00
0cc25061b0
Merge pull request #114240 from sorki/containers/nested
...
nixos/nixos-containers: default boot.enableContainers to true
2021-04-25 11:37:01 +01:00
5aa4273e4f
treewide: use auto diskSize for make-disk-image
...
(cherry picked from commit f3aa040bcb
2021-04-24 14:49:07 -04:00
d04f1c4314
Merge pull request #101071 from ju1m/apparmor
...
apparmor: try again to fix and improve
2021-04-24 11:24:26 +00:00
d8d6ba0d2e
Merge master into staging-next
2021-04-24 06:05:30 +00:00
4fb91cbafe
Revert "treewide: use auto diskSize for make-disk-image"
...
This reverts commit f3aa040bcb
2021-04-24 02:38:36 +00:00
05d334cfe2
Revert "Revert "apparmor: fix and improve the service""
...
This reverts commit 420f89ceb2
2021-04-23 07:17:55 +02:00
b95da5efb6
Merge master into staging-next
2021-04-22 18:14:27 +00:00
f3aa040bcb
treewide: use auto diskSize for make-disk-image
2021-04-22 19:52:49 +02:00
Artturi
Luke Granger-Brown
lassulus
Michael Francis
Jeremy Kolb
AmineChikhaoui
zowoq
Robert Hensing
Janne Heß
Maximilian Bosch
Jörg Thalheim
Sandro
Johan Thomsen
github-actions[bot]
Hedtke, Moritz
Laurynas Alekna
Silvan Mosberger
Jack Kelly
Florian Klink
Peter Hoeg
pennae
Lassulus
Frederik Rietdijk
Michael Raskin
Julien Moutinho