diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-07 11:34:50 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-07 11:34:50 -0700 |
| commit | 08ff83eab3ade9c923e36f03bc09d297bbe5e9f3 (patch) | |
| tree | ab1250b315bbcb6fcb5bcb8885a40875b2639ce7 /nixos | |
| parent | b028c14256d08c1dcb5a26f37edc879885cac20d (diff) | |
| download | nixlib-08ff83eab3ade9c923e36f03bc09d297bbe5e9f3.tar nixlib-08ff83eab3ade9c923e36f03bc09d297bbe5e9f3.tar.gz nixlib-08ff83eab3ade9c923e36f03bc09d297bbe5e9f3.tar.bz2 nixlib-08ff83eab3ade9c923e36f03bc09d297bbe5e9f3.tar.lz nixlib-08ff83eab3ade9c923e36f03bc09d297bbe5e9f3.tar.xz nixlib-08ff83eab3ade9c923e36f03bc09d297bbe5e9f3.tar.zst nixlib-08ff83eab3ade9c923e36f03bc09d297bbe5e9f3.zip | |
nixos/btrfs: Fix parsing of `btrfs subvolume show` with btrfsprogs 4.1
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a929e1eb8262..b768be6a3e01 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -354,7 +354,7 @@ EOF if ($status != 0 || join("", @msg) =~ /ERROR:/) { 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) { die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" } elsif ($#ids == 0) { diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index c4b1abc8cb03..34bff727b73a 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -186,7 +186,7 @@ sub GrubFs { if ($status != 0) { 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) { die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" } elsif ($#ids == 0) { |