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

nixos-generate-config: don't generate swapDevices for zram devices (#75921)

This commit is contained in:
buckley310 2019-12-19 15:03:21 -05:00 committed by Danylo Hlynskyi
parent 5b210859f6
commit ebbb7165c5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,6 +335,9 @@ if (@swaps) {
next unless -e $swapFilename; next unless -e $swapFilename;
my $dev = findStableDevPath $swapFilename; my $dev = findStableDevPath $swapFilename;
if ($swapType =~ "partition") { if ($swapType =~ "partition") {
# zram devices are more likely created by configuration.nix, so
# ignore them here
next if ($swapFilename =~ /^\/dev\/zram/);
push @swapDevices, "{ device = \"$dev\"; }"; push @swapDevices, "{ device = \"$dev\"; }";
} elsif ($swapType =~ "file") { } elsif ($swapType =~ "file") {
# swap *files* are more likely specified in configuration.nix, so # swap *files* are more likely specified in configuration.nix, so