diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
| commit | 2fec9c6e297e02718db6be53d645524f0052a7bc (patch) | |
| tree | 93e73a98dfaa40b290a6e15cf7f61054e5dc59e0 /nixos/modules/system/boot/loader | |
| parent | e9961bf9a9f7410c2891c7e86c21ed6388c70d78 (diff) | |
| parent | ba816ee08721d0c2f5f7e6652091bed085ac7687 (diff) | |
| download | nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.gz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.bz2 nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.lz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.xz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.zst nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/development/tools/build-managers/conan/default.nix
Diffstat (limited to 'nixos/modules/system/boot/loader')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index cc03e54ead63..8bd203106f55 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -182,7 +182,7 @@ sub GrubFs { # Based on the type pull in the identifier from the system my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}"); if ($status != 0) { - die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}"; + die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}"; } my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; if ($#matches != 0) { |