Merge pull request #194588 from wegank/prl-tools-6.0

authored by Sandro and committed by GitHub e6cf6a32 2ad8c95a

+17
+4
pkgs/os-specific/linux/prl-tools/default.nix
··· 34 34 sha256 = "sha256-yrCg3qr96SUCHmT3IAF79/Ha+L82V3nIC6Hb5ugXoGk="; 35 35 }; 36 36 37 + patches = lib.optionals (lib.versionAtLeast kernel.version "6.0") [ 38 + ./prl-tools-6.0.patch 39 + ]; 40 + 37 41 hardeningDisable = [ "pic" "format" ]; 38 42 39 43 nativeBuildInputs = [ p7zip undmg perl bbe autoPatchelfHook ]
+13
pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch
··· 1 + diff --git a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c 2 + index baa8a19..6788791 100644 3 + --- a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c 4 + +++ b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c 5 + @@ -306,7 +306,7 @@ int seq_show(struct seq_file *file, void *data) 6 + char buf[BDEVNAME_SIZE]; 7 + 8 + fsb = list_entry((struct list_head*)data, struct frozen_sb, list); 9 + - bdevname(fsb->sb->s_bdev, buf); 10 + + snprintf(buf, sizeof(buf), "%pg", fsb->sb->s_bdev); 11 + seq_printf(file, "%s\n", buf); 12 + return 0; 13 + }