Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next"" ... In 87a19e9048 I merged staging-next into master using the GitHub gui as intended. In ac241fb7a5 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 0be87c7979. This was however wrong, as it "removed" master. This reverts commit 0be87c7979.		2020-02-05 19:41:25 +01:00
..
loader	Fix boot.loader.grub.extraFiles when used with mirroredBoots	2020-02-03 15:37:00 -08:00
binfmt.nix	nixos/treewide: Move rename.nix imports to their respective modules	2019-12-10 02:51:19 +01:00
emergency-mode.nix	nixos: tmp on tmpfs option	2014-07-30 16:19:26 +02:00
grow-partition.nix	nixos/treewide: Move rename.nix imports to their respective modules	2019-12-10 02:51:19 +01:00
initrd-network.nix	Merge pull request #47665 from erikarvstedt/initrd-improvements	2019-01-06 21:48:26 -06:00
initrd-ssh.nix	nixos/initrd: improve descriptions	2018-10-02 17:38:06 +02:00
kernel_config.nix	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
kernel.nix	treewide: use attrs instead of list for types.loaOf options	2020-01-06 10:39:18 -05:00
kexec.nix	treewide: remove redundant quotes	2019-08-26 21:40:19 +00:00
luksroot.nix	boot.initrd.luks: adding a warning when using FIDO2 with kernel ≤ 5.4	2020-01-22 16:00:40 +01:00
modprobe.nix	modprobe activation: Order after specialfs	2018-02-05 21:04:40 +01:00
networkd.nix	Merge pull request #74624 from Ma27/networkd-units-internal	2020-02-02 07:59:57 +01:00
pbkdf2-sha512.c
plymouth.nix	plymouth: Add extra config field	2019-10-25 11:22:45 -04:00
resolved.nix	nixos/resolved: add user systemd-resolve to group systemd-resolve	2019-11-25 10:46:28 +01:00
shutdown.nix	Don't run hwclock if /dev/rtc doesn't exist	2014-05-05 16:47:51 +02:00
stage-1-init.sh	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
stage-1.nix	stage-1 initrd: replace absolute paths for mdadm	2019-08-01 00:55:35 +03:00
stage-2-init.sh	Typo	2019-10-10 16:24:33 +02:00
stage-2.nix	resolvconf service: init	2019-07-15 20:25:39 +03:00
systemd-lib.nix	nixos/systemd-lib: don't fail on systemd.packages duplicates	2020-01-07 21:42:14 -05:00
systemd-nspawn.nix	nixos/systemd-nspawn: use config.systemd.package	2019-12-21 17:19:26 +01:00
systemd-unit-options.nix	nixos/systemd: Allow unit options to have multiple equal defs (#73024)	2019-11-08 15:45:44 +00:00
systemd.nix	nixos/systemd: add systemd.sleep.extraConfig config option	2020-02-03 18:33:15 +02:00
timesyncd.nix	nixos/timesyncd: add user systemd-timesync to group systemd-timesync	2019-11-25 10:46:28 +01:00
tmp.nix	nixos: tmp on tmpfs option	2014-07-30 16:19:26 +02:00