nixos: check resumeDevice is absolute path and document
Fixes #5219 after merging #4995. (cherry picked from commit 0681d61c3730c686548df3af9a7dc1a59abaf371) Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
parent
8bb494c170
commit
3bcd3ed017
|
@ -240,8 +240,9 @@ in
|
||||||
example = "/dev/sda3";
|
example = "/dev/sda3";
|
||||||
description = ''
|
description = ''
|
||||||
Device for manual resume attempt during boot. This should be used primarily
|
Device for manual resume attempt during boot. This should be used primarily
|
||||||
if you want to resume from file. Specify here the device where the file
|
if you want to resume from file. If left empty, the swap partitions are used.
|
||||||
resides. You should also use <varname>boot.kernelParams</varname> to specify
|
Specify here the device where the file resides.
|
||||||
|
You should also use <varname>boot.kernelParams</varname> to specify
|
||||||
<literal><replaceable>resume_offset</replaceable></literal>.
|
<literal><replaceable>resume_offset</replaceable></literal>.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
@ -355,10 +356,17 @@ in
|
||||||
|
|
||||||
config = mkIf (!config.boot.isContainer) {
|
config = mkIf (!config.boot.isContainer) {
|
||||||
|
|
||||||
assertions = singleton
|
assertions = [
|
||||||
{ assertion = any (fs: fs.mountPoint == "/") (attrValues config.fileSystems);
|
{ assertion = any (fs: fs.mountPoint == "/") (attrValues config.fileSystems);
|
||||||
message = "The ‘fileSystems’ option does not specify your root file system.";
|
message = "The ‘fileSystems’ option does not specify your root file system.";
|
||||||
};
|
}
|
||||||
|
{ assertion = let inherit (config.boot) resumeDevice; in
|
||||||
|
resumeDevice == "" || builtins.substring 0 1 resumeDevice == "/";
|
||||||
|
message = "boot.resumeDevice has to be an absolute path."
|
||||||
|
+ " Old \"x:y\" style is no longer supported.";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
system.build.bootStage1 = bootStage1;
|
system.build.bootStage1 = bootStage1;
|
||||||
system.build.initialRamdisk = initialRamdisk;
|
system.build.initialRamdisk = initialRamdisk;
|
||||||
|
|
Loading…
Reference in a new issue