github-actions[bot]
bbbd0a92af
Merge master into staging-next
2022-01-25 00:02:13 +00:00
Luflosi
1c58cdbeed
nixos/modprobe: add boot.initrd.extraModprobeConfig option
...
This option behaves exactly like `boot.extraModprobeConfig`, except that it also includes the generated modprobe.d file in the initrd.
Many years ago, someone tried to include the normal modprobe.d/nixos.conf file generated by `boot.extraModprobeConfig` in the initrd: 0aa2c1dc464a4c051a95https://github.com/NixOS/nixpkgs/issues/25456 .
2022-01-24 22:56:14 +01:00
github-actions[bot]
93a9821309
Merge master into staging-next
2022-01-23 18:01:11 +00:00
Janne Heß
ce8c102a46
Merge pull request #155054 from jonringer/fix-systemd-boot
...
nixos/systemd-boot: fix error output
2022-01-23 16:23:13 +01:00
github-actions[bot]
fd5336b13e
Merge master into staging-next
2022-01-21 18:01:25 +00:00
Janne Heß
45048dfd0a
Merge pull request #153095 from Madouura/dev/bcachefs-init
...
nixos/stage-1: colon-separated multi-device support
2022-01-21 16:35:10 +01:00
github-actions[bot]
fc3ddb8979
Merge master into staging-next
2022-01-21 00:01:42 +00:00
datafoo
9bfb803dce
nixos/networking: fix assertion on IPMasquerade
2022-01-20 13:43:12 +01:00
Jonathan Ringer
87502df43b
nixos/systemd-boot: fix error output
2022-01-14 15:42:19 -08:00
github-actions[bot]
a6928c74cc
Merge master into staging-next
2022-01-13 12:01:29 +00:00
pennae
466cb747c8
Merge pull request #150408 from Enzime/systemd-boot-extra-entries
...
nixos/systemd-boot: Add `extraEntries` and `extraFiles` options
2022-01-13 07:15:05 +00:00
github-actions[bot]
7def368b6f
Merge master into staging-next
2022-01-12 18:01:16 +00:00
Alyssa Ross
5c8ddfd0b5
nixos/stage-1: update udev.log_level name in docs
...
I was confused why I couldn't find a mention of udev.log_priority in
systemd-udevd.service(8). It turns out that it was renamed[1] to
udev.log_level. The old name is still accepted, but it'll avoid
further confusion if we use the new name in our documentation.
[1]: 64a3494c3d
2022-01-12 14:04:14 +00:00
Madoura
f363642de7
nixos/stage-1: colon-separated multi-device support
2022-01-09 18:06:03 -06:00
github-actions[bot]
cf7efe1192
Merge staging-next into staging
2022-01-08 12:01:36 +00:00
Maciej Krüger
801d832872
Merge pull request #125451 from zhaofengli/qemu-riscv64-sd-image
2022-01-07 22:14:05 +01:00
Zhaofeng Li
16a907b00b
generic-extlinux-compatible: Allow disabling generation of device tree directives
2022-01-06 17:23:10 -08:00
github-actions[bot]
1342506d40
Merge staging-next into staging
2022-01-07 00:04:19 +00:00
0x4A6F
29acc14f0d
Merge pull request #143060 from zhaofengli/binfmt-argv0
...
nixos/binfmt: Add QEMU wrapper to preserve argv[0]
2022-01-06 19:21:47 +01:00
Naïm Favier
f2065d81ad
stdenv/generic: introduce shellDryRun
...
Add `shellDryRun` to the generic stdenv and substitute it for uses of
`${stdenv.shell} -n`. The point of this layer of abstraction is to add
the flag `-O extglob`, which resolves #126344 in a more direct way.
2021-12-27 20:30:01 -05:00
Artturi
3239e947d1
Merge pull request #151156 from Artturin/fsckonbat
2021-12-27 04:18:40 +02:00
Michael Hoang
13903fef2d
nixos/systemd-boot: Add option to add netboot.xyz
2021-12-23 11:44:29 +11:00
Michael Hoang
f6b61981b1
nixos/systemd-boot: Support extra EFI entries
2021-12-23 11:44:29 +11:00
Florian Klink
60e571fa40
Merge pull request #150922 from ncfavier/systemd-tzdir
...
nixos/systemd: set TZDIR for PID 1
2021-12-22 11:52:27 +01:00
Artturin
c44f95a855
nixos/stage1: run fsck on battery too
...
We are in 2021 almost 2022 not in 2004 when this may have been an issue!
https://alioth-lists.debian.net/pipermail/pkg-sysvinit-devel/2009-May/003196.html
https://www.nico.schottelius.org/blog/debian-ubuntu-fsck-skip-on-battery-bug/
d29daf3952https://bugs.launchpad.net/ubuntu/+source/laptop-mode/+bug/11194
2021-12-18 06:06:10 +02:00
Graham Christensen
06edb74413
Merge pull request #148785 from pennae/more-option-doc-staticizing
...
treewide: more defaultText for options
2021-12-17 11:14:08 -05:00
Naïm Favier
901d4f13a3
nixos/systemd: set TZDIR for PID 1
...
Fixes #105049
2021-12-16 04:09:07 +01:00
Andreas Rammhold
6e69e537ff
Merge pull request #145183 from veehaitch/networkd-DHCPServerStaticLease
...
nixos/networkd: add `dhcpServerStaticLeaseConfig` option
2021-12-09 12:57:46 +01:00
pennae
2d564521c0
treewide: add literalDocBook text to options with complex defaults
...
some options have default that are best described in prose, such as
defaults that depend on the system stateVersion, defaults that are
derivations specific to the surrounding context, or those where the
expression is much longer and harder to understand than a simple text
snippet.
2021-12-09 01:38:24 +01:00
ajs124
eee45bb295
Merge pull request #146815 from ElvishJerricco/systemd-utils-expressions
...
Move systemd-lib.nix and systemd-unit-options.nix into utils
2021-12-08 15:07:28 +00:00
Janne Heß
e36ceb65e6
Merge pull request #129449 from ddz/copy-initrd-secrets-after-early-mount-script
...
nixos/stage1: copy initrd secrets into place after special mounts
2021-12-08 15:38:02 +01:00
Yuka
ce54a4f658
nixos/networkd: add RoutingPolicyRule Type option ( #146168 )
2021-12-07 10:13:22 +01:00
pennae
2512455639
nixos/*: add trivial defaultText for options with simple defaults
2021-12-02 22:35:04 +01:00
Zhaofeng Li
9e5d0a9458
nixos/binfmt: Preserve argv[0] when using QEMU
2021-12-01 22:20:48 -08:00
Vincent Haupert
ce81231420
nixos/networkd: add dhcpServerStaticLeaseConfig option
...
Add `systemd.network.networks.*.dhcpServerStaticLeaseConfig` to allow
for configuring static DHCP leases through the `[DHCPServerStaticLease]`
section. See systemd.network(5) of systemd 249 for details.
Also adds the NixOS test `systemd-networkd-dhcpserver-static-lease` to
test the assignment of static leases.
2021-11-30 09:58:33 +01:00
Dominik Xaver Hörl
0360e03520
nixos/install-grub: fix whitespace
...
This time hopefully without changing the generated boot script.
2021-11-27 10:18:21 +01:00
Dominik Xaver Hörl
19447850a2
Revert "nixos/install-grub: normalize whitespace"
...
This morally reverts commit 0e8d7f9b3d
2021-11-27 10:18:04 +01:00
github-actions[bot]
28641f51dc
Merge master into staging-next
2021-11-22 18:01:08 +00:00
Artturin
7f24a5ff35
nixos/systemd: readd dbus-org.freedesktop.login1.service to upstreamSystemUnits
...
it was removed in
eb862c48dd (diff-5ea4693beb4bdd8f7efcdd3204ceea67c86f59b3d1c28cde063ddf03e1d20fbfL66)
2021-11-22 05:59:05 +02:00
github-actions[bot]
18ad263272
Merge master into staging-next
2021-11-21 18:01:07 +00:00
Ryan Burns
2175b157ac
treewide: refactor isi686 && isx86_64 -> isx86
2021-11-20 17:50:41 -08:00
Will Fancher
851495a752
Move systemd-lib.nix and systemd-unit-options.nix into utils
2021-11-20 17:52:29 -05:00
github-actions[bot]
90829d83e5
Merge master into staging-next
2021-11-17 00:01:49 +00:00
n0emis
eeac1c543d
nixos/networkd: add BatmanAdvanced options ( #145963 )
...
Since systemd v248 networkd supports BatmanAdvanced.
This adds the according config options to the networkd-module
2021-11-16 23:41:17 +01:00
github-actions[bot]
d5964b8c81
Merge staging-next into staging
2021-11-10 00:02:09 +00:00
Christian Kögler
33ffba995d
NixOS: Document impurity issues with boot.binfmt.emulatedSystems ( #142778 )
...
* NixOS: Document impurity issues with boot.binfmt.emulatedSystems
* Update nixos/modules/system/boot/binfmt.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
* Update nixos/modules/system/boot/binfmt.nix
Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>
* Update nixos/modules/system/boot/binfmt.nix
Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>
* Update nixos/modules/system/boot/binfmt.nix
Co-authored-by: markuskowa <markus.kowalewski@gmail.com>
* Apply suggestions from code review
Co-authored-by: markuskowa <markus.kowalewski@gmail.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>
Co-authored-by: markuskowa <markus.kowalewski@gmail.com>
2021-11-09 21:49:45 +01:00
Florian Klink
6ae271565d
Merge pull request #140046 from jrobsonchase/systemd-boot/fix-regexp
...
nixos/systemd-boot: Fix installed version regexp
2021-11-06 12:24:32 +01:00
Josh Robson Chase
3efc2de6d1
nixos/systemd-boot: Use the correct version string from the bootctl --version output
2021-11-05 12:11:22 -04:00
Josh Robson Chase
4ddc78818e
nixos/systemd-boot: Re-add the verison check, but as equivalence-only
2021-11-05 12:11:21 -04:00
Josh Robson Chase
71ed9d096e
nixos/systemd-boot: Remove the installed version check altogether
...
bootctl does it as a part of its update process anyway, so we're just
duplicating code.
2021-11-05 12:11:20 -04:00
