From 83f28589be57154add7db07d7c359c7cb2e95eae Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 13 Sep 2013 16:55:32 +0200
Subject: [stage32] Some work on system startup regarding systemd dependencies
 - still somewhat messy, but already way more restricted and predictable than
 before when it comes to ordering

---
 .../rootfs-stage32/data/etc/systemd/system/setup-partitions.service  | 4 ++--
 .../rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service  | 5 +++--
 .../rootfs-stage32/data/etc/systemd/system/update-etc_issue.service  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'remote/rootfs')

diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service
index 20e789a4..4e663d56 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=Setup local disk partitions (tmp, swap)
-After=sysinit.target
-Before=shutdown.target
 DefaultDependencies=no
+Before=sysinit.target shutdown.target
+Wants=sysinit.target
 
 [Service]
 Type=oneshot
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service
index acc827c9..6a5b63ad 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Download, mount and append SLX addons
-After=sysinit.target setup-partitions.service
-Wants=setup-partitions.service
+After=setup-partitions.service
+DefaultDependencies=no
 
 [Service]
 Type=oneshot
 ExecStart=/opt/openslx/scripts/systemd-setup_slx_addons
 RemainAfterExit=yes
+
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service
index c4f45a3c..21a09b7c 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Update /etc/issue
-Before=sysinit.target shutdown.target
+Before=getty.target shutdown.target
 DefaultDependencies=no
 
 [Service]
-- 
cgit v1.2.3-55-g7522