From 7160501dbef5969e75f3a71f7fb530c40d9e1344 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 30 Aug 2025 10:23:35 +0200 Subject: [PATCH] lvm2: make manpage generation reproducible Fixes #434933 --- pkgs/os-specific/linux/lvm2/common.nix | 2 ++ .../lvm2/fix-manpage-reproducibility.patch | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index cc612e8ddaf8..ffe184e23f06 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -128,6 +128,8 @@ stdenv.mkDerivation rec { } )) ./fix-stdio-usage.patch + # https://gitlab.com/lvmteam/lvm2/-/merge_requests/33 + ./fix-manpage-reproducibility.patch ]; doCheck = false; # requires root diff --git a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch b/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch new file mode 100644 index 000000000000..1e687f3630cc --- /dev/null +++ b/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch @@ -0,0 +1,31 @@ +commit 950f219ed287358df8c128f7e22989177a8de47c +Author: Arnout Engelen +Date: Mon Aug 25 15:55:44 2025 +0200 + + man: simplify vmautoactivation(7) + + Previously this was hard-coded to: "Autoactivation commands use a number + of temp files in /run/lvm (with the expectation that /run is cleared + between boots.)" + + Since c1bfc8737f08bf7558b2d788e9756f895cd9eaaa it was made more generic, + but on some systems this logic leads to "Autoactivation commands use a + number of temp files in /run/lvm (with the expectation that /var/run + is cleared between boots)." which I'd say adds more confusion than it + solves. + +diff --git a/man/lvmautoactivation.7_main b/man/lvmautoactivation.7_main +index e55943b29..9d429055c 100644 +--- a/man/lvmautoactivation.7_main ++++ b/man/lvmautoactivation.7_main +@@ -175,9 +175,7 @@ is reserved for udev output.) + . + Autoactivation commands use a number of temp files in + .I #DEFAULT_RUN_DIR# +-(with the expectation that +-.I #DEFAULT_PID_DIR# +-is cleared between boots). ++(with the expectation that it is cleared between boots). + . + .TP + .B pvs_online