pyrox.dev
lol
nixos/btrfs: Fix parsing of `btrfs subvolume show` with btrfsprogs 4.1
+2
-2
+1
-1
nixos/modules/installer/tools/nixos-generate-config.pl
+1
-1
nixos/modules/installer/tools/nixos-generate-config.pl
···
354
354
if ($status != 0 || join("", @msg) =~ /ERROR:/) {
355
355
die "Failed to retrieve subvolume info for $mountPoint\n";
356
356
}
357
-
my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
357
+
my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
358
358
if ($#ids > 0) {
359
359
die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
360
360
} elsif ($#ids == 0) {
+1
-1
nixos/modules/system/boot/loader/grub/install-grub.pl
+1
-1
nixos/modules/system/boot/loader/grub/install-grub.pl
···
186
186
if ($status != 0) {
187
187
die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
188
188
}
189
-
my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
189
+
my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
190
190
if ($#ids > 0) {
191
191
die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
192
192
} elsif ($#ids == 0) {