mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 14:10:33 +03:00
Merge master into staging-next
This commit is contained in:
commit
96ecef502b
87 changed files with 1846 additions and 1404 deletions
|
@ -634,7 +634,7 @@ in
|
|||
{
|
||||
where = "/sysroot/run";
|
||||
what = "/run";
|
||||
options = "bind";
|
||||
options = "rbind";
|
||||
unitConfig = {
|
||||
# See the comment on the mount unit for /run/etc-metadata
|
||||
DefaultDependencies = false;
|
||||
|
|
|
@ -46,6 +46,10 @@
|
|||
"overlay"
|
||||
];
|
||||
|
||||
system.requiredKernelConfig = with config.lib.kernelConfig; [
|
||||
(isEnabled "EROFS_FS")
|
||||
];
|
||||
|
||||
boot.initrd.systemd = {
|
||||
mounts = [
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue