pyrox.dev
lol
btrfs-progs: 4.8.2 -> 4.13.1
+6
-10
+4
-8
nixos/modules/installer/tools/nixos-generate-config.pl
+4
-8
nixos/modules/installer/tools/nixos-generate-config.pl
···
398
398
399
399
# Is this a btrfs filesystem?
400
400
if ($fsType eq "btrfs") {
401
-
my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint");
402
-
if ($status != 0 || join("", @id_info) =~ /ERROR:/) {
401
+
my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
402
+
if ($status != 0 || join("", @info) =~ /ERROR:/) {
403
403
die "Failed to retrieve subvolume info for $mountPoint\n";
404
404
}
405
-
my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
405
+
my @ids = join("", @info) =~ m/Subvolume ID:[ \t\n]*([0-9]*)/;
406
406
if ($#ids > 0) {
407
407
die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
408
408
} elsif ($#ids == 0) {
409
-
my ($status, @path_info) = runCommand("btrfs subvol list $rootDir$mountPoint");
410
-
if ($status != 0) {
411
-
die "Failed to find $mountPoint subvolume id from btrfs\n";
412
-
}
413
-
my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/;
409
+
my @paths = join("", @info) =~ m/^([^\n]*)/;
414
410
if ($#paths > 0) {
415
411
die "Btrfs returned multiple paths for a single subvolume id, mountpoint $mountPoint\n";
416
412
} elsif ($#paths != 0) {
+2
-2
pkgs/tools/filesystems/btrfs-progs/default.nix
+2
-2
pkgs/tools/filesystems/btrfs-progs/default.nix
···
2
2
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
3
3
}:
4
4
5
-
let version = "4.8.2"; in
5
+
let version = "4.13.1"; in
6
6
7
7
stdenv.mkDerivation rec {
8
8
name = "btrfs-progs-${version}";
9
9
10
10
src = fetchurl {
11
11
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
12
-
sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41";
12
+
sha256 = "1clavvrlkswgicqsm2yfsxqw04lsn8dra0db84jqm6j2apz80kz0";
13
13
};
14
14
15
15
buildInputs = [