mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 13:40:28 +03:00
Merge master into staging-next
This commit is contained in:
commit
fc7fa5f568
104 changed files with 5116 additions and 5201 deletions
|
@ -56,6 +56,22 @@ in
|
|||
default = null;
|
||||
example = "/dev/vda";
|
||||
};
|
||||
|
||||
empty = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"refuse"
|
||||
"allow"
|
||||
"require"
|
||||
"force"
|
||||
"create"
|
||||
];
|
||||
description = ''
|
||||
Controls how to operate on empty devices that contain no partition table yet.
|
||||
See {manpage}`systemd-repart(8)` for details.
|
||||
'';
|
||||
example = "require";
|
||||
default = "refuse";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.repart = {
|
||||
|
@ -145,7 +161,9 @@ in
|
|||
''
|
||||
${config.boot.initrd.systemd.package}/bin/systemd-repart \
|
||||
--definitions=/etc/repart.d \
|
||||
--dry-run=no ${lib.optionalString (initrdCfg.device != null) initrdCfg.device}
|
||||
--dry-run=no \
|
||||
--empty=${initrdCfg.empty} \
|
||||
${lib.optionalString (initrdCfg.device != null) initrdCfg.device}
|
||||
''
|
||||
];
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue