diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-01-22 15:23:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 15:23:09 +0100 |
| commit | 115cf2e2cf7f665332affa8767a2aaada60b07c4 (patch) | |
| tree | 5365060cd062703fa9f15a42069aa3425f3b292a /nixos/modules | |
| parent | 2f9ef8c563729dfdacc87287bb836f52d799b148 (diff) | |
| parent | 352e06d3da68f0faf600e8f765328751dfe29266 (diff) | |
| download | nixlib-115cf2e2cf7f665332affa8767a2aaada60b07c4.tar nixlib-115cf2e2cf7f665332affa8767a2aaada60b07c4.tar.gz nixlib-115cf2e2cf7f665332affa8767a2aaada60b07c4.tar.bz2 nixlib-115cf2e2cf7f665332affa8767a2aaada60b07c4.tar.lz nixlib-115cf2e2cf7f665332affa8767a2aaada60b07c4.tar.xz nixlib-115cf2e2cf7f665332affa8767a2aaada60b07c4.tar.zst nixlib-115cf2e2cf7f665332affa8767a2aaada60b07c4.zip | |
Merge pull request #54339 from avdv/avoid-duplicate-luks-device
installer/tools: Avoid duplicate LUKS device entries in hw config
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 52a129b39bcd..bad9356ab5a6 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -449,7 +449,11 @@ EOF if (-e $slave) { my $dmName = read_file("/sys/class/block/$deviceName/dm/name"); 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"; + } } } } |