summary refs log tree commit diff
path: root/nixos/modules/system
AgeCommit message (Collapse)AuthorFilesLines
2020-02-05Revert "Revert "Merge master into staging-next""Frederik Rietdijk1-5/+8
In 87a19e9048773d5a363679617406ad148d36c3b8 I merged staging-next into master using the GitHub gui as intended. In ac241fb7a570d6cf81d229ad22a8889602639160 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master. Thinking this may cause trouble, I reverted it in 0be87c79797a5fa384fbc356c74ed54f9f7829ea. This was however wrong, as it "removed" master. This reverts commit 0be87c79797a5fa384fbc356c74ed54f9f7829ea.
2020-02-05Revert "Merge master into staging-next"Frederik Rietdijk1-8/+5
I merged master into staging-next but accidentally pushed it to master. This should get us back to 87a19e9048773d5a363679617406ad148d36c3b8. This reverts commit ac241fb7a570d6cf81d229ad22a8889602639160, reversing changes made to 76a439239eb310d9ad76d998b34d5d3bc0e37acb.
2020-02-05Merge pull request #35188 from sorki/overlayfsSilvan Mosberger1-5/+8
use overlayfs by default for netboot and iso
2020-02-05use overlayfs by default for netboot and isoRichard Marko1-5/+8
2020-02-05Merge pull request #77594 from Frostman/fix-grub-extrafiles-mirroredbootsSilvan Mosberger2-1/+4
Fix boot.loader.grub.extraFiles when used with mirroredBoots
2020-02-03Fix boot.loader.grub.extraFiles when used with mirroredBootsSergey Lukjanov2-1/+4
Substitute @bootPath@ in boot.loader.grub.extraPrepareConfig script same way as it's done for boot.loader.grub.extraEntries option.
2020-02-03nixos/systemd: add `systemd.sleep.extraConfig` config optionmisuzu1-0/+11
2020-02-02Revert "add config.environment.ld-linux"Eelco Dolstra1-31/+0
This reverts commit af665d822a166ae62547c1c310207f11acaded17, see https://github.com/NixOS/nixpkgs/pull/78798#issuecomment-580059834 for the reasons in a similar PR.
2020-02-02Revert "rmdir: avoid failing when directory did not exist"Eelco Dolstra1-2/+2
This reverts commit 45db499d2de2235388212a911b8344b58ddfda36.
2020-02-02Merge pull request #74624 from Ma27/networkd-units-internalMaximilian Bosch1-1/+2
nixos/networkd: mark `units` option as internal
2020-01-31Merge pull request #78476 from Ma27/networkd-vrf-optionsAndreas Rammhold1-0/+25
nixos/networkd: add vrfConfig option for netdevs, add simple test
2020-01-27Merge pull request #69057 from volth/ld-linuxMatthew Bauer1-1/+32
add config.environment.ld-linux
2020-01-27Merge pull request #78426 from Mic92/tmpfilesJörg Thalheim1-0/+4
nixos/systemd: add all systemd tmpfiles files
2020-01-25nixos/networkd: add `vrfConfig` option to netdevsMaximilian Bosch1-0/+25
2020-01-24nixos/systemd: add all systemd tmpfiles filesJörg Thalheim1-0/+4
Especially tmp.conf is important to create /tmp and /var/tmp with the correct permissions.
2020-01-22boot.initrd.luks: adding a warning when using FIDO2 with kernel ≤ 5.4Marek Mahut1-40/+16
2020-01-22boot.initrd.luks: Adding FIDO2 supportMarek Mahut1-2/+101
2020-01-21Merge pull request #77665 from zaninime/ifxfrmFlorian Klink1-2/+38
systemd-networkd: add configuration for XFRM interfaces
2020-01-14systemd-networkd: add configuration for XFRM interfacesFrancesco Zanini1-2/+38
2020-01-07nixos/systemd-lib: don't fail on systemd.packages duplicatesworldofpeace1-1/+7
In some cases like we've noticed in https://github.com/NixOS/nixpkgs/issues/76169, having duplicate packages in systemd.packages like ``` systemd.packages = [ gnome-shell gnome-shell gnome-session ]; ``` breaks. Here we use an associative array to ensure no duplicate paths when we symlink all the units listed in systemd.packages.
2020-01-06nixos/systemd: Explicitly put default path packages after othe… (#77088)Silvan Mosberger1-1/+1
nixos/systemd: Explicitly put default path packages after others
2020-01-06treewide: use attrs instead of list for types.loaOf optionsrnhmjoj2-8/+7
2020-01-06nixos/systemd: Explicitly put default path packages after othersSilvan Mosberger1-1/+1
This fixes the dhcpcd issue in https://github.com/NixOS/nixpkgs/issues/76969, which was exposed by https://github.com/NixOS/nixpkgs/pull/75031 introducing changes in the module ordering and therefore option ordering too. The dhcpcd issue would also be fixable by explicitly putting dhcpcd's paths before others, however it makes more sense for systemd's default paths to be after all others by default, since they should only be a fallback, which is how binary finding will work if they come after.
2019-12-21nixos/systemd-nspawn: use `config.systemd.package`Maximilian Bosch1-1/+1
When using a modified systemd-package (e.g. to test a patch), it's recommended to use the `systemd.package`-option to avoid rebuilding all packages that somehow depend on systemd. With this change, the modified package is also used by `systemd-nspawn@` units.
2019-12-10nixos/treewide: Move rename.nix imports to their respective modulesSilvan Mosberger5-3/+19
A centralized list for these renames is not good because: - It breaks disabledModules for modules that have a rename defined - Adding/removing renames for a module means having to find them in the central file - Merge conflicts due to multiple people editing the central file
2019-12-06Merge pull request #72888 from fooker/pr-3Maximilian Bosch1-1/+1
nixos/networkd: Add more valid values for RequiredForOnline
2019-12-06nixos/networkd: add missing "Advertise" optionFlorian Klink1-1/+1
This is in systemd since v240.
2019-11-30Revert "nixos/switch-to-configuration: restart changed socket units"Domen Kožar1-11/+1
This reverts commit 89806e95363f06869c9de18586e32c8ef65bd2fd. See #74626
2019-11-29nixos/networkd: mark `units` option as internalMaximilian Bosch1-1/+2
The options at `systemd.network` (`links`, `netdevs` and `networks`) are directly mapped to the three different unit types of `systemd-networkd(8)`. However there's also the option `systemd.network.units` which is basically used as a container for generated unit-configs that are linked to `/etc/systemd/networkd`[1]. This should not be exposed to the user as it's unclear whether or not it should be used directly which can be pretty confusing which is why I decided to declare this option as internal (including all sub-options as `internal` doesn't seem to be propagated to submodules). [1] https://github.com/NixOS/nixpkgs/blob/9db75ed88fd87e17ec448ad7a43b62acb4842854/nixos/modules/system/boot/networkd.nix#L933-L937
2019-11-26Merge pull request #73871 from mayflower/socket-activation-fixDomen Kožar1-1/+11
nixos/switch-to-configuration: restart changed socket units
2019-11-25nixos/switch-to-configuration: restart changed socket unitsFranz Pletz1-1/+11
Previously, socket units wouldn't be restarted if they were changed. To restart the socket, the service the socket is attached to needs to be stopped first before the socket can be restarted.
2019-11-25nixos/timesyncd: add user systemd-timesync to group systemd-timesyncWilliButz1-1/+4
2019-11-25nixos/resolved: add user systemd-resolve to group systemd-resolveWilliButz1-0/+2
2019-11-25nixos/networkd: add systemd-network user to group systemd-networkWilliButz1-0/+2
2019-11-24Merge remote-tracking branch 'upstream/master' into wrapper-pname-supportJohn Ericson14-39/+134
2019-11-24treewide: Get rid of most `parseDrvName` without breaking compatJohn Ericson1-2/+2
That is because this commit should be merged to both master and release-19.09.
2019-11-23nixos/networkd: add missing `dhcpv6` and `static` options to ↵Maximilian Bosch1-1/+1
`IPv6PrefixDelegation`
2019-11-20Merge master into staging-nextFrederik Rietdijk2-1/+14
2019-11-20nixos/timesyncd: add extraConfig option(cdep)illabout1-0/+13
This adds an `extraConfig` option to timesyncd for setting additional options in `/etc/systemd/timesyncd.conf`. This is similar to things like `services.journald.extraConfig` and `services.logind.extraConfig`.
2019-11-19nixos/networkd: add `Name` as valid option to `Link`Dustin Frisch1-1/+1
This has been there since v209 [1] ``` The interface name to use. This option has lower precedence than NamePolicy=, so for this setting to take effect, NamePolicy= must either be unset, empty, disabled, or all policies configured there must fail. Also see the example below with "Name=dmz0". Note that specifying a name that the kernel might use for another interface (for example "eth0") is dangerous because the name assignment done by udev will race with the assignment done by the kernel, and only one interface may use the name. Depending on the order of operations, either udev or the kernel will win, making the naming unpredictable. It is best to use some different prefix, for example "internal0"/"external0" or "lan0"/"lan1"/"lan3". ``` [1] https://github.com/systemd/systemd/commit/43b3a5ef61859f06cdbaf26765cab8e1adac4296
2019-11-11Merge staging-next into stagingFrederik Rietdijk2-1/+11
2019-11-09Merge pull request #71986 from mtetreault/mte/plymouth-improvementsThomas Tuegel1-0/+10
plymouth: Add extra config field
2019-11-08nixos/systemd: Allow unit options to have multiple equal defs (#73024)Silvan Mosberger1-1/+1
E.g. this allows systemd.services.<name?>.serviceConfig.DynamicUser = mkMerge [ true true ];
2019-11-06nixos/networkd: Add more valid values for RequiredForOnlineDustin Frisch1-1/+1
`RequiredForOnline` allows for a boolean value or operational state. This adds the values for all valid the operational states.
2019-11-05Merge pull request #70352 from wucke13/systemd-importdFlorian Klink1-0/+2
systemd: add systemd-importd
2019-11-02systemd: adding support for systemd-importdwucke131-0/+2
Adding `systemd-importd` to the build, so that `machinectl`s `import-.*` may actually do anything. Currently they fail with ``` Failed to transfer image: The name org.freedesktop.import1 was not provided by any .service files ``` as `systemd-importd` is not built. Also registers the regarding dbus api and service in the systemd module.
2019-10-28nixos/networkd: add `ipv4-fallback` and `fallback` as valid options to ↵Maximilian Bosch1-1/+1
`LinkLocalAddressing` Both options were introduced in systemd v243[1]. Those options can be used to ensure that LinkLocalAddressing is only configured for a given interface if DHCPv4 fails. To quote `systemd.network(5)`: ``` If "fallback" or "ipv4-fallback" is specified, then an IPv4 link-local address is configured only when DHCPv4 fails. If "fallback", an IPv6 link-local address is always configured, and if "ipv4-fallback", the address is not configured. Note that, the fallback mechanism works only when DHCPv4 client is enabled, that is, it requires "DHCP=yes" or "DHCP=ipv4". ``` [1] https://github.com/systemd/systemd/commit/8bc17bb3f707c99b6c9ad295563c92b38141a1f4
2019-10-25plymouth: Add extra config fieldMathieu A.-Tetreault1-0/+10
Signed-off-by: Mathieu A.-Tetreault <alexandretm@amotus.ca>
2019-10-14nixos/plymouth: do not order `plymouth-quit` after `display-manager`Tor Hedin Brønner1-4/+1
GDM now specifies ordering between `plymouth-quit` and `display-manager`: 9be5321097c16 This causes an ordering cycle between GDM and plymouth-quit which can result in systemd breaking GDM: ``` plymouth-quit.service: Job display-manager.service/start deleted to break ordering cycle starting with plymouth-quit.service/start ``` Not sure how often this triggers, as I've run my system with plymouth and 9be5321097c16 without any issues. But I did catch a VM doing this. NOTE: I also tried to remove the ordering in GDM to see if plymouth managed to live longer, but it didn't seem to help. So I opted to stick as close to upstream (upstream GDM specifies ordering, but plymouth does not).
2019-10-12Merge pull request #69422 from arianvp/fix-machinectlFlorian Klink1-7/+17
nixos/systemd: Make machinectl work with NixOS