…

1 files changed, 3 insertions, 5 deletions

diff --git a/custom/lvm-snapshots.nix b/custom/lvm-snapshots.nix
index c78de3a5..5e4557f3 100644
--- a/custom/lvm-snapshots.nix
+++ b/custom/lvm-snapshots.nix
@@ -9,8 +9,6 @@ let
   snapshotMount = name: "${cfg.mountPoint}/${if isNull cfg.snapshots."${name}".mountName then name else cfg.snapshots."${name}".mountName}";
   snapshotName = name: "${name}-snapshot";
 
-  instance = scfg: escapeSystemdPath (scfg.VG + "/" + scfg.LV);
-
   snapshotConfig = {
     options = {
       LV = mkOption {
@@ -67,7 +65,7 @@ in {
       mkdir -p ${snapshotMount name}
     '') cfg.snapshots;
 
-    systemd.services = mapAttrs' (name: scfg: nameValuePair ("lvm-snapshot@" + instance scfg) {
+    systemd.services = mapAttrs' (name: scfg: nameValuePair ("lvm-snapshot@" + escapeSystemdPath name) {
       enable = true;
 
       description = "LVM-snapshot of ${scfg.VG}/${scfg.LV}";
@@ -111,8 +109,8 @@ in {
         StopWhenUnneeded = !scfg.persist;
       };
 
-      bindsTo = [ ("lvm-snapshot@" + instance scfg + ".service") ];
-      after = [ ("lvm-snapshot@" + instance scfg + ".service") ];
+      bindsTo = [ ("lvm-snapshot@" + escapeSystemdPath name + ".service") ];
+      after = [ ("lvm-snapshot@" + escapeSystemdPath name + ".service") ];
 
       options = concatStringsSep "," ([ "noauto" ] ++ optional scfg.readOnly "ro");