From a0eed32cb5d8d38a801ea040b3e0a9ea92381a12 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Tue, 30 Dec 2025 12:14:51 +0100
Subject: [PATCH] lvm2: fix lvresize with filesystem

- move to libexec from lib/libexec
- add path to config, if services.lvm.enable is set
---
 nixos/modules/tasks/lvm.nix            | 8 ++++----
 pkgs/os-specific/linux/lvm2/common.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index cce30c38021e..8cf2db05dff4 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
@@ -51,7 +51,7 @@ in
   config = mkMerge [
     {
       # minimal configuration file to make lvmconfig/lvm2-activation-generator happy
-      environment.etc."lvm/lvm.conf".text = "config {}";
+      environment.etc."lvm/lvm.conf".text = lib.mkBefore "config {}";
     }
     (mkIf cfg.enable {
       systemd.tmpfiles.packages = [ cfg.package.out ];
@@ -59,6 +59,8 @@ in
       systemd.packages = [ cfg.package ];
 
       services.udev.packages = [ cfg.package.out ];
+      environment.etc."lvm/lvm.conf".text =
+        "global/lvresize_fs_helper_executable = ${pkgs.lvm2.scripts}/libexec/lvresize_fs_helper";
     })
     (mkIf config.boot.initrd.services.lvm.enable {
       # We need lvm2 for the device-mapper rules
@@ -71,9 +73,7 @@ in
       systemd.sockets."dm-event".wantedBy = [ "sockets.target" ];
       systemd.services."lvm2-monitor".wantedBy = [ "sysinit.target" ];
 
-      environment.etc."lvm/lvm.conf".text = ''
-        dmeventd/executable = "${cfg.package}/bin/dmeventd"
-      '';
+      environment.etc."lvm/lvm.conf".text = "dmeventd/executable = ${cfg.package}/bin/dmeventd";
       services.lvm.package = mkDefault pkgs.lvm2_dmeventd;
     })
     (mkIf cfg.boot.thin.enable {
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index d9fd4c131d68..2e4de4038f9a 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -202,7 +202,7 @@ stdenv.mkDerivation rec {
       moveToOutput bin/lvmdump $scripts
       moveToOutput bin/lvm_import_vdo $scripts
       moveToOutput bin/lvmpersist $scripts
-      moveToOutput libexec/lvresize_fs_helper $scripts/lib
+      moveToOutput libexec/lvresize_fs_helper $scripts
     ''
     + lib.optionalString (!enableCmdlib) ''
       moveToOutput lib/libdevmapper.so $lib