public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

installer/tools: Avoid duplicate LUKS device entries in hw config

Browse Source 
There are situations where several filesystems reside on a single encrypted LUKS
device (e.g. when using BTRFS subvolumes).

Simply generating a `boot.init.luks.devices.NAME.device` entry for each mounted
filesystem will result in an error later when evaluating the nix expression in
`hardware-configuration.nix`.
This commit is contained in:
Claudio Bley 2019-01-19 21:44:05 +01:00
parent 50555a6d35
commit 352e06d3da
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -449,7 +449,11 @@ EOF
if (-e $slave) { if (-e $slave) {
my $dmName = read_file("/sys/class/block/$deviceName/dm/name"); my $dmName = read_file("/sys/class/block/$deviceName/dm/name");
chomp $dmName; chomp $dmName;
$fileSystems .= " boot.initrd.luks.devices.\"$dmName\".device = \"${\(findStableDevPath $slave)}\";\n\n"; # Ensure to add an entry only once
my $luksDevice = " boot.initrd.luks.devices.\"$dmName\".device";
if ($fileSystems !~ /^\Q$luksDevice\E/m) {
$fileSystems .= "$luksDevice = \"${\(findStableDevPath $slave)}\";\n\n";
}
} }
} }
} }