Lin Jian
437f73dd54
nixos/systemd-boot: fix entry match condition in remove_old_entries
...
Before this patch, the entry match condition always fails, causing all
entries being removed. The error is not noticed because later they are
re-generated.
2022-10-07 20:43:48 +08:00
Lin Jian
642323930e
nixos/systemd-boot: correctly find gen_number for specialisation
...
Before this patch, the gen_number found by regex contains
"-specialisation-foo" if specialisation is used. As a result, applying
int() to gen_number raises ValueError, causing entries containing
a specialisation part not being removed.
2022-10-07 19:28:43 +08:00
Cole Mickens
3d5d6fc78c
nixos: luksroot: toString-ify keyFileSize usage
2022-10-06 15:06:50 -07:00
Zhaofeng Li
b9b454820a
systemd/initrd: Add TPM modules into initrd
...
This improves the out-of-box experience of TPM2 unlocking at a
small (50K) overhead.
2022-10-05 08:22:53 -06:00
Zhaofeng Li
21bbef9548
nixos/luksroot: Reword message on FIDO2 support with systemd stage 1
2022-10-05 08:22:53 -06:00
Zhaofeng Li
19c34ac44b
systemd/initrd: Add files required by TPM2 and FIDO2 support to the initramfs
2022-10-05 08:22:14 -06:00
Zhaofeng Li
570824e102
systemd: Wrap in LUKS2 tokens
...
Update pkgs/os-specific/linux/systemd/default.nix
Co-authored-by: Janne Heß <janne@hess.ooo>
Co-authored-by: Ilan Joselevich <personal@ilanjoselevich.com>
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2022-10-05 08:22:14 -06:00
github-actions[bot]
855f2990f1
Merge staging-next into staging
2022-10-05 12:02:14 +00:00
Florian Klink
c1c406bc87
Merge pull request #191491 from oxalica/fix/systemd-initrd-modprobe
...
nixos/systemd-stage-1: include modprobe confg in initrd
2022-10-05 10:39:58 +02:00
github-actions[bot]
d426366b62
Merge staging-next into staging
2022-10-05 00:05:03 +00:00
Gabriel Arazas
292aab9822
nixos/systemd: update extraConfig description
2022-10-03 11:17:41 +08:00
phaer
fcd5087046
systemd: build with portabled by default.
2022-09-30 14:53:50 +02:00
Robert Hensing
d1f0a6d972
nixos/systemd/oomd: mdDoc fix
2022-09-28 16:07:42 +02:00
Bernardo Meurer
2e0cca58f0
Merge pull request #169613 from helsinki-systems/feat/systemd-oomd
2022-09-28 09:53:49 -03:00
Franz Pletz
1f41992899
Merge pull request #187073 from penglei/master
2022-09-27 05:33:22 +02:00
Sandro Jäckel
03b6d5111a
nixos/systemd: remove not required or true
2022-09-19 13:45:01 +02:00
oxalica
c5c42d4fbe
nixos/systemd-stage-1: include modprobe confg in initrd
2022-09-16 20:54:04 +08:00
Yureka
19686a4452
nixos/systemd: conditionally include systemd-update-utmp upstream unit
2022-09-13 10:34:28 +02:00
Christian Kögler
cfbf9bd15c
nixos/nspawn: Fix configuration name PrivateUsersOwnership
...
Fix #189046
2022-09-11 13:08:36 +02:00
Christian Kögler
0ea763fab6
Merge pull request #188009 from martiert/fido2luks
...
nixos/luksroot: Support adding a list of credentials to fido2luks
2022-09-11 07:42:57 +02:00
pennae
d98322834b
nixos/*: fix docbook deprecation notices
...
mostly no rendering changes except in buildkite, which used markdown
where docbook was expected without marking up its markdown.
2022-09-10 18:23:13 +02:00
Christian Kögler
d44b9d665c
Merge pull request #189201 from jmbaur/ipv6-route-prefix-example
...
nixos/systemd.network: Fix `ipv6RoutePrefixes` example
2022-09-09 17:05:36 +02:00
Christian Kögler
7d731f3bca
nixos/nspawn: Remove not compliant options
...
The attribute set sharedOptions pulls in not compliant unit options:
- requiredBy
- wantedBy
- aliases
see man5 systemd.nspawn
2022-09-05 17:01:23 +02:00
penglei
6393cb765e
nixos/boot/stage-1-init: umount /findiso in stage-1
2022-09-05 08:59:29 +08:00
pennae
3bddcf5f90
Merge branch 'master' into option-docs-md
2022-09-01 16:10:09 +02:00
Martin Ertsås
5e4921013b
nixos/luksroot: Support adding a list of credentials to fido2luks
...
This adds support for using multiple fido2 keys for luks decryption
2022-09-01 08:55:46 +02:00
Jared Baur
51a1c73542
nixos/systemd.network: Fix ipv6RoutePrefixes example
...
The example doesn't have the top-level attribute `ipv6RoutePrefixConfig`
in each attrset of the list.
2022-08-31 17:04:18 -07:00
pennae
1d41cff3dc
nixos/*: convert straggler options to MD
2022-08-31 17:27:38 +02:00
pennae
722b99bc0e
nixos/*: convert options with admonitions to MD
...
rendering changes only slightly, most changes are in spacing.
2022-08-31 16:36:16 +02:00
pennae
515c4727fa
nixos/*: md-"convert" empty descriptions
...
for some reason these are not picked up properly by nix-doc-munge, so
we'll do this instead.
2022-08-31 16:32:54 +02:00
pennae
9547123258
nixos/*: convert internal option descriptions to MD
...
we'll have to do it eventually, may as well be now.
2022-08-31 16:32:54 +02:00
pennae
ef176dcf7e
nixos/*: automatically convert option descriptions
...
conversions were done using https://github.com/pennae/nix-doc-munge
using (probably) rev f34e145 running
nix-doc-munge nixos/**/*.nix
nix-doc-munge --import nixos/**/*.nix
the tool ensures that only changes that could affect the generated
manual *but don't* are committed, other changes require manual review
and are discarded.
2022-08-31 16:32:53 +02:00
pennae
c915b915b5
nixos/*: md-convert options with unordered lists
...
mostly no rendering changes. some lists (like simplelist) don't have an
exact translation to markdown, so we use a comma-separated list of
literals instead.
2022-08-31 16:32:53 +02:00
pennae
0cfcb5908c
nixos/*: <screen> -> <programlisting>
...
most of the screen tags used in option docs are actually listings of
some sort. nsd had a notable exception where its screen usage was pretty
much a raw markdown block that made most sense to convert into docbook lists.
2022-08-31 16:27:24 +02:00
pennae
5841c386a0
nixos/*: remove indentation from long enable options
...
the way these are written they introduce lots of whitespace in each
line, which will cause those lines to render as code when converted to
markdown. override the whole description instead.
2022-08-31 16:21:14 +02:00
Janne Heß
3284f4fa19
nixos/systemd-oomd: Add a new module + test
2022-08-31 13:24:32 +02:00
Will Fancher
78e892c44d
Merge pull request #187222 from winterqt/systemd-boot-esp-path
...
nixos/systemd-boot: use esp-path instead of path when calling bootctl
2022-08-30 12:57:40 -04:00
Florian Klink
087fa6565d
Merge pull request #184340 from jmbaur/ipv6routeprefix
...
nixos/systemd.network: Add `IPv6RoutePrefix` options
2022-08-30 11:10:47 +02:00
pennae
51a11254a7
nixos/*: literalDocBook -> literalMD
...
no change to rendered output
2022-08-27 19:18:29 +02:00
Will Fancher
037cf37ad2
Merge pull request #185085 from ElvishJerricco/shutdown-ramfs-protection
...
shutdown: Protect system from make-initrd-ng
2022-08-26 13:25:31 -04:00
Martin Weinelt
2ae8a945fb
Merge pull request #188309 from Sohalt/systemd-networkd-dhcpserver-missing-options
2022-08-26 11:50:50 +02:00
sohalt
8b74b21d23
nixos/networkd: add missing options for DHCPServer and IPV6SendRA
2022-08-26 11:42:58 +02:00
Martin Weinelt
e7454ee38b
Merge pull request #187444 from peigongdsd/test
2022-08-26 08:17:46 +02:00
Will Fancher
2239c5d55f
Merge pull request #186163 from lilyinstarlight/feature/systemd-stage-1-fs-label
...
nixos/systemd-stage-1: unify initrd fstab generation logic with system fstab
2022-08-20 18:29:07 -04:00
pennae
6039648c50
nixos/*: automatically convert option docs
2022-08-19 22:40:58 +02:00
pennae
7e7d68a250
nixos/*: mark pre-existing markdown descriptions as mdDoc
2022-08-19 22:40:58 +02:00
pennae
e4ed177f82
nixos/* eliminate inner whitespace in tags that was missed earlier
...
nix-doc-munge won't match tags that contain newlines anywhere. most of
these have already been removed, but a few obviously made it through.
2022-08-19 22:40:58 +02:00
peigongdsd
506cb62c4e
modified: nixos/modules/system/boot/networkd.nix
2022-08-19 21:00:18 +08:00
peigongdsd
90de9ee689
nixos/modules/system/boot/networkd.nix: added Group= option in sectionLink of systemd.networkd config
...
see also: systemd.network(5)
2022-08-19 20:53:08 +08:00
Lily Foster
69d7943101
nixos/systemd-stage-1: unify initrd fstab generation logic with system fstab
2022-08-18 13:33:43 -04:00
Winter
771ef9f738
nixos/systemd-boot: use esp-path instead of path when calling bootctl
...
`path` has been aliased to `esp-path` for over 3 years (see fbf45d22da
2022-08-18 01:08:07 -04:00
Jared Baur
4f58def5e6
Merge branch 'NixOS:master' into ipv6routeprefix
2022-08-17 15:08:31 -07:00
pennae
50f9b3107a
Merge pull request #185474 from pennae/option-docs-md
...
nixos/*: more options md conversion
2022-08-12 23:23:26 +02:00
Sergei Trofimovich
925a9bb753
Merge pull request #185530 from trofi/restore-stage-1-strip
...
nixos/stage-1: srestore striping of bin/ and lib/
2022-08-11 08:50:45 +01:00
Jörg Thalheim
5a436f538f
Merge pull request #179619 from Informatic/plymouth-systemd-stage1-themes
...
nixos/plymouth: fix theme dependency resolution in systemd stage 1
2022-08-11 08:38:33 +01:00
Robert Hensing
661c29c806
Merge pull request #181222 from hercules-ci/module-specialArgs
...
`_module.specialArgs` + unit test for nixos/documentation module
2022-08-08 11:53:10 +02:00
Sergei Trofimovich
fb324910bf
nixos/stage-1: srestore striping of bin/ and lib/
...
commit 0507725061
2022-08-07 11:05:29 +01:00
pennae
087472b1e5
nixos/*: automatically convert option docs
2022-08-06 20:39:12 +02:00
Bernardo Meurer
5b3a9a815d
Merge pull request #185089 from NickCao/bind
...
nixos/stage-1-systemd: fix initrd-fstab generation for bind mounts
2022-08-05 14:25:11 -07:00
pennae
423545fe48
nixos/*: normalize manpage references to single-line form
...
now nix-doc-munge will not introduce whitespace changes when it replaces
manpage references with the MD equivalent.
no change to the manpage, changes to the HTML manual are whitespace only.
2022-08-05 18:34:50 +02:00
pennae
93c57a9884
Merge pull request #185056 from pennae/option-docs-md
...
nixos/*: more option docs conversions
2022-08-05 17:36:49 +02:00
Christian Kögler
04d94dc8ff
Merge pull request #183897 from amarshall/networkd-fix-ipv6prefixes-example
...
nixos/networkd: Fix some invalid examples
2022-08-04 23:02:40 +02:00
Sandro
6c55138d9b
Merge pull request #184786 from danc86/fido2luks-discard
2022-08-04 15:08:58 +02:00
Dan Callaghan
da26caad10
nixos/luksroot: allow discards with fido2luks
2022-08-04 19:32:14 +10:00
Nick Cao
ce39bee9dd
nixos/stage-1-systemd: fix initrd-fstab generation for bind mounts
2022-08-04 10:26:37 +08:00
Will Fancher
a454a706b5
shutdown: Protect system from make-initrd-ng
2022-08-03 22:18:47 -04:00
pennae
61e93df189
nixos/*: automatically convert option docs to MD
...
once again using nix-doc-munge (69d080323a
2022-08-03 22:46:41 +02:00
pennae
3aebb4a2be
nixos/*: normalize link format
...
make (almost) all links appear on only a single line, with no
unnecessary whitespace, using double quotes for attributes. this lets us
automatically convert them to markdown easily.
the few remaining links are extremely long link in a gnome module, we'll
come back to those at a later date.
2022-08-03 21:57:46 +02:00
pennae
9c8531c8a5
nixos/*: replace <replaceable>s with «thing»
...
we can't embed syntactic annotations of this kind in markdown code
blocks without yet another extension. replaceable is rare enough to make
this not much worth it, so we'll go with «thing» instead. the module
system already uses this format for its placeholder names in attrsOf
paths.
2022-08-03 21:08:58 +02:00
pennae
694d5b19d3
nixos/*: replace </para><para> with double linebreaks
...
our xslt already replaces double line breaks with a paragraph close and
reopen. not using explicit para tags lets nix-doc-munge convert more
descriptions losslessly.
only whitespace changes to generated documents, except for two
strongswan options gaining paragraph two breaks they arguably should've
had anyway.
2022-08-03 20:39:21 +02:00
K900
eabbad8af1
Merge pull request #185036 from K900/goblinization
...
make-initrd-ng: parse ELFs ourselves instead of shelling out to patchelf and friends
2022-08-03 19:57:55 +03:00
Janne Heß
bc7ff29bdf
Merge pull request #184822 from snpschaaf/networkd-link-add-promiscious
...
add Promiscuous as valid value for linkConfig
2022-08-03 11:05:32 +02:00
Philippe Schaaf
d5e7f6a613
add Promiscuous as valid value for linkConfig
...
configuring a network via
`systemd.network.networks.<name>.linkConfig`
does not allow to set the attr Promiscuous = "true";
This referes to:
https://www.freedesktop.org/software/systemd/man/systemd.network.html#Promiscuous=
Signed-off-by: Philippe Schaaf <philippe.schaaf@secunet.com>
2022-08-03 09:05:42 +02:00
Vladimír Čunát
a0ebaa7431
Merge #183748 : staging-next 2022-07-29
2022-08-03 09:04:16 +02:00
Florian Klink
dfda3c3e04
Merge pull request #182577 from squalus/coredump
...
nixos: systemd-coredump: improve disabled state
2022-08-03 13:32:11 +07:00
Linus Heckemann
6fc909a1cc
makeInitrdNG: make stripping fully optional
...
Now the tool will only strip binaries if a strip executable is passed
via the STRIP environment variable. This is exposed via the strip
option for makeInitrdNG and the NixOS option boot.initrd.systemd.strip.
2022-08-02 10:19:48 +03:00
github-actions[bot]
0f0010fda3
Merge master into staging-next
2022-08-02 06:02:34 +00:00
squalus
257db1dd4a
nixos: systemd-coredump: improve disabled state
...
The systemd-coredump module required systemd to be built with
withCoredump=true, even if the module was disabled.
- allow systemd to be missing systemd-coredump if the module is disabled
- switch to mkDefault for the sysctl config to allow user overrides when
the module is disabled
- add nixos tests for both the enabled and disabled cases
2022-08-01 09:52:56 -07:00
Jared Baur
b1bb3bcad8
nixos/systemd.network: Add IPv6RoutePrefix options
2022-07-31 14:11:01 -07:00
pennae
2e751c0772
treewide: automatically md-convert option descriptions
...
the conversion procedure is simple:
- find all things that look like options, ie calls to either `mkOption`
or `lib.mkOption` that take an attrset. remember the attrset as the
option
- for all options, find a `description` attribute who's value is not a
call to `mdDoc` or `lib.mdDoc`
- textually convert the entire value of the attribute to MD with a few
simple regexes (the set from mdize-module.sh)
- if the change produced a change in the manual output, discard
- if the change kept the manual unchanged, add some text to the
description to make sure we've actually found an option. if the
manual changes this time, keep the converted description
this procedure converts 80% of nixos options to markdown. around 2000
options remain to be inspected, but most of those fail the "does not
change the manual output check": currently the MD conversion process
does not faithfully convert docbook tags like <code> and <package>, so
any option using such tags will not be converted at all.
2022-07-30 15:16:34 +02:00
Andrew Marshall
51adf865a3
nixos/networkd: Fix example for dhcpServerStaticLeaseOptions option
...
The example was not valid, and would raise an error.
2022-07-30 00:55:56 -04:00
Andrew Marshall
a9fbd07f56
nixos/networkd: Fix example for ipv6Prefixes option
...
The example was not valid, and would raise an error.
2022-07-30 00:55:56 -04:00
github-actions[bot]
c5298a170d
Merge staging-next into staging
2022-07-27 18:02:13 +00:00
pennae
a16b25432e
Merge pull request #182685 from pennae/invariant-option-conversions
...
treewide: invariant option conversions to MD
2022-07-27 15:39:47 +02:00
github-actions[bot]
52e7c12c41
Merge staging-next into staging
2022-07-26 06:02:58 +00:00
Jared Baur
777e914c20
nixos/systemd.network: Add RequiredFamilyForOnline to linkConfig
...
While writing a configuration, I found a usage for this field and
noticed it was missing when building the configuration.
2022-07-26 04:11:33 +02:00
github-actions[bot]
4a6e124c33
Merge staging-next into staging
2022-07-24 12:02:06 +00:00
pennae
ff56c775c8
Merge pull request #182098 from pennae/option-doc-md
...
convert some varlists in option docs to MD
2022-07-24 13:14:40 +02:00
pennae
860a0449ce
nixos/system: invariant option docs MD conversions
2022-07-24 13:01:47 +02:00
github-actions[bot]
b4832bac52
Merge staging-next into staging
2022-07-22 15:34:59 +00:00
Maximilian Bosch
779853b52b
Merge pull request #182413 from NetaliDev/pam-mount-fix-refactor
...
nixos/pam: refactor pam_mount unmounting fix
2022-07-22 14:05:44 +02:00
github-actions[bot]
dec2508b80
Merge staging-next into staging
2022-07-22 12:02:21 +00:00
Florian Klink
7c119675a3
Merge pull request #179002 from klemensn/move-passwdEntry-type
...
move passwdEntry type
2022-07-22 14:16:57 +07:00
K900
c9183d3738
nixos/systemd: make sure all the device nodes are created in stage1
...
The ConditionFileNotEmpty override patch wasn't correct for stage1, which
does have the modules in /lib. So, remove the patch and set
the right path with overrides in the final system.
Also, make sure systemd-tmpfiles-setup-dev is pulled in to create
all the necessary symlinks.
2022-07-22 10:01:21 +03:00
Netali
93132dc09c
nixos/pam: refactor pam_mount unmounting fix
2022-07-22 04:17:14 +02:00
Robert Hensing
ec3e1c6a3a
nixos/documentation: Remove systemd/initrd dependency
...
Working towards a unit-testable documentation module.
2022-07-21 15:32:10 +02:00
pennae
7388711363
nixos/resolved: convert option docs to MD
2022-07-19 16:23:57 +02:00
Sandro Jäckel
4396fd615c
nixos/systemd-boot: remove default log message if nothing changes
2022-07-17 21:46:50 +02:00
Bernardo Meurer
c6b0888a86
Merge pull request #180991 from aij/raspberrypi-bootloader-config.txt
...
raspberrypi-bootloader: Update doc URL for config.txt options
2022-07-10 14:09:43 -07:00
Sandro
366683965e
Merge pull request #166308 from ncfavier/wg-resolvconf
...
nixos/resolvconf: allow different implementations
2022-07-10 21:00:00 +02:00
