diff options
| author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2017-07-13 23:43:48 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-31 10:56:34 +0200 |
| commit | 90ef2183f79ff2472d76994693bafafbb83b0089 (patch) | |
| tree | dc5491a357f83617d253de0601267004115000da /nixos/modules/system | |
| parent | dbba364f64aab825937c95df411a1ebc2d9c6f4b (diff) | |
| download | nixlib-90ef2183f79ff2472d76994693bafafbb83b0089.tar nixlib-90ef2183f79ff2472d76994693bafafbb83b0089.tar.gz nixlib-90ef2183f79ff2472d76994693bafafbb83b0089.tar.bz2 nixlib-90ef2183f79ff2472d76994693bafafbb83b0089.tar.lz nixlib-90ef2183f79ff2472d76994693bafafbb83b0089.tar.xz nixlib-90ef2183f79ff2472d76994693bafafbb83b0089.tar.zst nixlib-90ef2183f79ff2472d76994693bafafbb83b0089.zip | |
grub module: assume /nix/store is a bind mount even if it is not read only
Fixes #14999
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 1edb9e0d229b..82b5bcda9217 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -121,8 +121,8 @@ sub GetFs { my $device = $fields[$n + 1]; my @superOptions = split /,/, $fields[$n + 2]; - # Skip the read-only bind-mount on /nix/store. - next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions) && (grep { $_ eq "ro" } @mountOptions); + # Skip the bind-mount on /nix/store. + next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions); # Skip mount point generated by systemd-efi-boot-generator? next if $fsType eq "autofs"; |