daandemeyer / rpms / systemd

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