From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Jan 2011 02:30:13 +0000 (+0100)
Subject: cryptsetup: fix ordering loop when dealing with encrypted swap devices
X-Git-Tag: v17~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=63c862b051ae35199eb0d91c375b3c2b296bc0aa

cryptsetup: fix ordering loop when dealing with encrypted swap devices

https://bugzilla.redhat.com/show_bug.cgi?id=657234
---

diff --git a/Makefile.am b/Makefile.am
index 47d3ac020..e796543d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1190,14 +1190,12 @@ install-data-hook:
 			fsck-root.service \
 			remount-rootfs.service \
 			var-run.mount \
-			var-lock.mount \
-			cryptsetup.target && \
+			var-lock.mount && \
 		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
 		$(LN_S) ../fsck-root.service fsck-root.service && \
 		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
 		$(LN_S) ../var-run.mount var-run.mount && \
-		$(LN_S) ../var-lock.mount var-lock.mount && \
-		$(LN_S) ../cryptsetup.target )
+		$(LN_S) ../var-lock.mount var-lock.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -1253,7 +1251,8 @@ install-data-hook:
 			systemd-random-seed-load.service \
 			systemd-tmpfiles-setup.service \
 			systemd-sysctl.service \
-			systemd-ask-password-console.path && \
+			systemd-ask-password-console.path \
+			cryptsetup.target && \
 		$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
 		$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
 		$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
@@ -1264,7 +1263,8 @@ install-data-hook:
 		$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
 		$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
 		$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
-		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
+		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
+		$(LN_S) ../cryptsetup.target cryptsetup.target )
 	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
 		rm -f systemd-tmpfiles-clean.timer && \
 		$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
diff --git a/TODO b/TODO
index 2b40b6986..9ba7221b0 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,5 @@
 Bugs:
 
-* dep loop when using encrypted swap
-  https://bugzilla.redhat.com/show_bug.cgi?id=657234
-
 * somehow some /etc/fstab supplied mount params are never applied to api fs
   https://bugzilla.redhat.com/show_bug.cgi?id=663108
 
diff --git a/units/cryptsetup.target b/units/cryptsetup.target
index 9e4db78e8..64ee8c614 100644
--- a/units/cryptsetup.target
+++ b/units/cryptsetup.target
@@ -9,6 +9,3 @@
 
 [Unit]
 Description=Encrypted Volumes
-
-[Install]
-WantedBy=local-fs.target