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

nixos/grub: Fix regex for getting subvolume name in btrfs

Browse Source
This commit is contained in:
William A. Kennington III
2014-08-28 13:35:36 -07:00
parent 6549bcff96
commit c02bc3a9de
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/loader/grub/install-grub.pl
+1 -1
View File
@@ -139,7 +139,7 @@ sub GrubFs {
if ($status != 0) { if ($status != 0) {
die "Failed to retreive subvolume info for @{[$fs->device]}"; die "Failed to retreive subvolume info for @{[$fs->device]}";
} }
my @subvols = join("", @info) =~ m/Name:[ \t\n]([^ \t\n]*)/; my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
if ($#subvols > 0) { if ($#subvols > 0) {
die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
} elsif ($#subvols == 0) { } elsif ($#subvols == 0) {