diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-05-02 01:46:07 -0500 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-08-28 13:35:36 -0700 |
| commit | c02bc3a9de319195597a16173e04357023e97643 (patch) | |
| tree | e50f1e8f1675430e3faa186aa062bece70f8f804 /nixos | |
| parent | 6549bcff9607efd68ecd8fca8ca15c4446b16fb9 (diff) | |
| download | nixlib-c02bc3a9de319195597a16173e04357023e97643.tar nixlib-c02bc3a9de319195597a16173e04357023e97643.tar.gz nixlib-c02bc3a9de319195597a16173e04357023e97643.tar.bz2 nixlib-c02bc3a9de319195597a16173e04357023e97643.tar.lz nixlib-c02bc3a9de319195597a16173e04357023e97643.tar.xz nixlib-c02bc3a9de319195597a16173e04357023e97643.tar.zst nixlib-c02bc3a9de319195597a16173e04357023e97643.zip | |
nixos/grub: Fix regex for getting subvolume name in btrfs
Diffstat (limited to 'nixos')
| -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 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) { |