daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
ecbff1
From 1fa67ac23b3fff0e04c55df8cca6a54994adf175 Mon Sep 17 00:00:00 2001
ecbff1
From: Ivan Shapovalov <intelfx@intelfx.name>
ecbff1
Date: Wed, 30 Aug 2017 19:49:07 +0300
ecbff1
Subject: [PATCH] cryptsetup-generator: do not bind to the decrypted device
ecbff1
 unit (#6538)
ecbff1
ecbff1
This breaks things when the decrypted device is not immediately
ecbff1
`SYSTEMD_READY=1` (e. g. when a multi-device btrfs system is placed on
ecbff1
multiple cryptsetup devices).
ecbff1
ecbff1
Fixes #6537.
ecbff1
ecbff1
(cherry picked from commit e9ea4526a3a3b41eced29b8d742498cc36750424)
ecbff1
ecbff1
Related: #1511043
ecbff1
---
ecbff1
 src/cryptsetup/cryptsetup-generator.c | 1 -
ecbff1
 1 file changed, 1 deletion(-)
ecbff1
ecbff1
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
ecbff1
index c387e2104..5f29093f5 100644
ecbff1
--- a/src/cryptsetup/cryptsetup-generator.c
ecbff1
+++ b/src/cryptsetup/cryptsetup-generator.c
ecbff1
@@ -110,7 +110,6 @@ static int create_disk(
ecbff1
                 "SourcePath=/etc/crypttab\n"
ecbff1
                 "DefaultDependencies=no\n"
ecbff1
                 "Conflicts=umount.target\n"
ecbff1
-                "BindsTo=dev-mapper-%%i.device\n"
ecbff1
                 "IgnoreOnIsolate=true\n"
ecbff1
                 "After=systemd-readahead-collect.service systemd-readahead-replay.service\n"
ecbff1
                 "After=%s\n",