From fc2ccd7abc96d1234ea129db8be6a63b83c1282a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 22 Jul 2021 13:20:43 +0200
Subject: [dnbd3-proxy-mode/disk-partitions] Add persistent.target

---
 .../modules/disk-partitions/data/etc/systemd/system/persistent.target | 2 ++
 .../disk-partitions/data/etc/systemd/system/setup-partitions.service  | 3 ++-
 .../data/etc/systemd/system/setup-dnbd3-proxy.service                 | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 core/modules/disk-partitions/data/etc/systemd/system/persistent.target

diff --git a/core/modules/disk-partitions/data/etc/systemd/system/persistent.target b/core/modules/disk-partitions/data/etc/systemd/system/persistent.target
new file mode 100644
index 00000000..68ab1052
--- /dev/null
+++ b/core/modules/disk-partitions/data/etc/systemd/system/persistent.target
@@ -0,0 +1,2 @@
+[Unit]
+Description=Persistent partition has been mounted (if found)
diff --git a/core/modules/disk-partitions/data/etc/systemd/system/setup-partitions.service b/core/modules/disk-partitions/data/etc/systemd/system/setup-partitions.service
index 1f570c9d..0c8a0dd4 100644
--- a/core/modules/disk-partitions/data/etc/systemd/system/setup-partitions.service
+++ b/core/modules/disk-partitions/data/etc/systemd/system/setup-partitions.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Setup local disk partitions (persistent, swap)
 After=systemd-udev-settle.service systemd-udevd.service
-Wants=tmp.target
+Wants=tmp.target persistent.target
+Before=persistent.target
 DefaultDependencies=no
 
 [Service]
diff --git a/core/modules/dnbd3-proxy-mode/data/etc/systemd/system/setup-dnbd3-proxy.service b/core/modules/dnbd3-proxy-mode/data/etc/systemd/system/setup-dnbd3-proxy.service
index 7b0dc5a9..533205a8 100644
--- a/core/modules/dnbd3-proxy-mode/data/etc/systemd/system/setup-dnbd3-proxy.service
+++ b/core/modules/dnbd3-proxy-mode/data/etc/systemd/system/setup-dnbd3-proxy.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=DNBD3 proxy server config generator
-Wants=tmp.target
-After=tmp.target
+Wants=tmp.target persistent.target
+After=tmp.target persistent.target
 Before=getty.target update-etc_issue.service
 
 [Service]
-- 
cgit v1.2.3-55-g7522