daandemeyer / rpms / systemd

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