From c02bc3a9de319195597a16173e04357023e97643 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 01:46:07 -0500 Subject: [PATCH] nixos/grub: Fix regex for getting subvolume name in btrfs --- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index d0d5307a804e..2725cea59960 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -139,7 +139,7 @@ sub GrubFs { if ($status != 0) { 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) { die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" } elsif ($#subvols == 0) {