colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
323,005 Commits 125 Branches 0 Tags 3.4 GiB
a997f198a3
Commit Graph

1189 Commits

Author SHA1 Message Date
Maximilian Bosch
f700a92d5c
nixos/qemu-vm: quote QEMU_NET_OPTS 
Co-authored-by: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
 2021-10-06 23:12:53 +02:00
Maximilian Bosch
60e731d1ce
nixos/qemu-vm: fix running VM with QEMU_NET_OPTS 
I realized quite recently that running a test VM - as documented in the
manual - like

    QEMU_NET_OPTS='hostfwd=tcp::8080-:80'  ./result/bin/nixos-run-vms

doesn't work anymore on `master`. After bisecting I realized that the
introduction of a forward-port option[1] is the problem since it adds a
trailing comma even if no forwarding options are specified via
`virtualisation.forwardPorts`. In that case, the networking options
would look like `-netdev user,id=user.0,,hostfwd=tcp::8080-:80' which
confused QEMU and thus the VM refused to start.

Now, the trailing comma is only added if additional port forwards are
specified declaratively.

[1] b8bfc81d5b
 2021-10-06 22:40:30 +02:00
Naïm Favier
2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
rnhmjoj
1497e8f5f5
nixos/qemu: use set -e in shell script 
Also fix this: https://github.com/koalaman/shellcheck/wiki/SC2166
 2021-09-29 08:46:03 +02:00
Timothy DeHerrera
895f3956d2
Merge pull request #127933 from rnhmjoj/qemu-restoration 
Qemu restoration
 2021-09-28 21:35:23 -06:00
rnhmjoj
b6fbbe768d
nixos/containerd: use v2 settings by default 
Kubernetes is using v2 setting names and is the only module
in Nixpkgs using containerd, so it makes sense to upgrade.
 2021-09-23 00:18:58 +02:00
rnhmjoj
74c572d2f8
nixos/vmware-guest: fix setuid wrapper 
Since 904f68fb0, setuid/owner/group are required.
 2021-09-20 23:49:46 +02:00
Jeremy Kolb
cb9167139e
vmware-guest: Use vmware-vmblock-fuse for drag-and-drop synchronization (#131278) 2021-09-19 18:15:41 +03:00
Guillaume Girol
ceb2e6667b
Merge pull request #126289 from rnhmjoj/wrappers 
nixos/security/wrappers: make well-typed
 2021-09-18 15:28:49 +00:00
rnhmjoj
b29c2f97c3
nixos/lib/qemu-flags: rename to qemu-common 
The current name is misleading: it doesn't contain cli arguments,
but several constants and utility functions related to qemu.
This commit also removes the use of `with import ...` for clarity.
 2021-09-18 16:58:16 +02:00
rnhmjoj
b8bfc81d5b
nixos/qemu: add option to forward ports 2021-09-18 16:47:12 +02:00
rnhmjoj
44d95b773b
nixos/qemu: make display resolution configurable 2021-09-18 16:47:11 +02:00
rnhmjoj
ec6c604b6e
nixos/qemu: make shared directories configurable 2021-09-18 16:47:11 +02:00
rnhmjoj
30f0faac22
nixos/qemu: add types to all options 2021-09-18 16:47:11 +02:00
rnhmjoj
f1f434c4f7
nixos/qemu: cleaner formatting of the run-machine-vm script 2021-09-18 16:47:11 +02:00
rnhmjoj
2af5413cc6
nixos/qemu: set a reasonable msize by default 2021-09-18 16:47:10 +02:00
rnhmjoj
65e83389ef
nixos/qemu: fix deprecation warning 2021-09-18 16:47:10 +02:00
rnhmjoj
c1fd51f490
nixos/qemu: fix several shellcheck issues 
- Fix shell quoting issues
- Fix unsafe cd in run-machine-vm script
 2021-09-18 16:46:20 +02:00
Artturi
74b3e9ff87
Merge pull request #136471 from Artturin/tmpontmpfssize 2021-09-16 02:25:02 +03:00
rnhmjoj
fedd7cd690
nixos: explicitely set security.wrappers ownership 
This is slightly more verbose and inconvenient, but it forces you
to think about what the wrapper ownership and permissions will be.
 2021-09-13 13:48:13 +02:00
Guillaume Girol
bc3bca822a nixos: define the primary group of users where needed 2021-09-12 14:59:30 +02:00
Artturin
f45e8d560e nixos/tmp: add tmpOnTmpfsSize 2021-09-08 19:30:52 +03:00
Graham Christensen
bd38b059ea NixOS/amazonImageZfs: init 
Introduce an AWS EC2 AMI which supports aarch64 and x86_64 with a ZFS
root.

This uses `make-zfs-image` which implies two EBS volumes are needed
inside EC2, one for boot, one for root. It should not matter which
is identified `xvda` and which is `xvdb`, though I have always
uploaded `boot` as `xvda`.
 2021-08-25 10:42:35 -04:00
Your Name
c042c1a1f8 NixOS AWS AMI: Create boot entries for each system generation 2021-08-20 14:02:11 -04:00
Your Name
1b79176310 NixOS AWS AMI: enable the serial console on ttyS0 2021-08-20 12:42:02 -04:00
Your Name
54aa35d40e NixOS AWS AMI: Configure Grub's serial console 
See:

* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-os.html
* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/grub.html
 2021-08-20 11:22:45 -04:00
Your Name
bfd2f800ee NixOS AMI: Give grub a 1s timeout now that AWS has emergency console access. 
See:

* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-os.html
* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/grub.html
 2021-08-20 11:22:39 -04:00
Your Name
0ccd6448d6 NixOS AWS AMI: Set the console to 115200n8 
See:

* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-os.html
* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/grub.html
 2021-08-20 11:15:31 -04:00
Robert Hensing
fbafeb7ad5 treewide: runCommandNoCC -> runCommand 
This has been synonymous for ~5y.
 2021-08-15 17:36:41 +02:00
edef
9451a23e9f
Merge pull request #130265 from liclac/gce-image-compression-level 
google-compute-image: Add a setting for GZIP compression level
 2021-08-13 14:31:08 +00:00
Artturi
c10ded1bb2
Merge pull request #131966 from ArctarusLimited/fix/containerd-restart 
nixos/virtualisation/containerd: do not wipe runtime directory on restart or stop
 2021-08-08 17:21:30 +03:00
Luke Granger-Brown
b5fab53628 nixos/virtualbox-image: cast baseImageFreeSpace into str 
This fixes an evaluation error that's blocking the nixos-unstable
channel (#132328).
 2021-08-01 18:59:08 +00:00
Alex Zero
bd14d73794
nixos/modules/virtualisation/containerd: do not wipe runtime directory on restart or stop 2021-07-29 16:17:40 +01:00
lassulus
a6700d75f3 vbox-image: add new option to set free space in image 2021-07-24 09:33:10 +02:00
embr
8e6c4f9a2e nixos/cri-o: Remove unnecessary lib. qualifiers 
We're already using `with lib` here, so we can just say `mkOption`, etc.
 2021-07-20 15:35:45 +10:00
embr
1cf78b53af nixos/cri-o: Add RFC42 'settings' option 2021-07-20 15:35:45 +10:00
Jeremy Kolb
f96ee10c88
open-vm-tools: 11.2.5 -> 11.3.0 (#129978) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-07-14 03:26:58 +02:00
embr
91646d62b9 google-compute-image: Make GZIP compression level configurable 
Change-Id: I1bde130f0a951fa40b1a16bad09497c796bca473
 2021-07-13 16:53:09 +02:00
Tobias Happ
bbd5cdac29 nixos/oci-containers: enable login for registry 2021-07-08 16:30:17 +10:00
Ramses
14d2192623 nixos/oci-containers: restore ability to easily view the container output in the logs 
Fixes #102768.
Allows the usage of `journalctl -u` to easily view the logs for a container managed by this module.
 2021-07-06 07:36:33 +10:00
Maciej Krüger
b877b70d32
Merge pull request #125366 from mkg20001/vbox-export-params 2021-06-28 06:58:01 +02:00
jakobrs
475c007da0 nixos/libvirtd: add assertion requiring polkit to be enabled 2021-06-07 15:12:21 +02:00
AmineChikhaoui
7e89fb12e4 ec2-amis: add release 21.05 2021-06-06 17:09:14 -07:00
Sandro
6e2204ea32
Merge pull request #123364 from edude03/patch-7 2021-06-06 01:35:18 +02:00
Edward Tjörnhammar
afdb5675a1 nixos/containers: add storage.conf 2021-06-05 10:08:24 +10:00
Maciej Krüger
26b3751de7
Merge pull request #97692 from ryneeverett/lockkernelmodules-lxd 2021-06-05 01:27:27 +02:00
zowoq
3cf17240f0 Revert "nixos/containers: add storage.conf" 
This file requires some defaults to be set otherwise podman, etc errors.
It also broke the podman nixos tests.

This reverts commit 7a4de9a983.
 2021-06-03 13:56:17 +10:00
Maciej Krüger
5faa7056f9
nixos/virtualbox-image: add exportParams 
This allows the user to specify custom export
parameters like adding a vendor to the exported VM
 2021-06-02 13:28:43 +02:00
Edward Tjörnhammar
7a4de9a983 nixos/containers: add storage.conf 2021-06-02 19:03:53 +10:00
Robert Hensing
d9e4512443
Merge pull request #124589 from hercules-ci/containers-dnsname 
nixos/podman-dnsname: init
 2021-06-02 08:18:48 +02:00