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

nixos/btrfs: Fix parsing of btrfs subvolume show with btrfsprogs 4.1

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-07 11:34:50 -07:00
parent b028c14256
commit 08ff83eab3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -354,7 +354,7 @@ EOF
if ($status != 0 || join("", @msg) =~ /ERROR:/) { if ($status != 0 || join("", @msg) =~ /ERROR:/) {
die "Failed to retrieve subvolume info for $mountPoint\n"; die "Failed to retrieve subvolume info for $mountPoint\n";
} }
my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/; my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
if ($#ids > 0) { if ($#ids > 0) {
die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
} elsif ($#ids == 0) { } elsif ($#ids == 0) {

2
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -186,7 +186,7 @@ sub GrubFs {
if ($status != 0) { if ($status != 0) {
die "Failed to retrieve subvolume info for @{[$fs->mount]}\n"; die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
} }
my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/; my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
if ($#ids > 0) { if ($#ids > 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 ($#ids == 0) { } elsif ($#ids == 0) {