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

---
 remote/modules/kdm/data/etc/systemd/system/kdm.service      |  5 +----
 .../modules/systemd/data/etc/systemd/system/network.target  | 13 +++++++++++++
 remote/modules/systemd/systemd.conf                         |  3 +--
 .../data/etc/systemd/system/setup-partitions.service        |  4 ++--
 .../data/etc/systemd/system/setup-slx-addons.service        |  5 +++--
 .../data/etc/systemd/system/update-etc_issue.service        |  2 +-
 6 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 remote/modules/systemd/data/etc/systemd/system/network.target

diff --git a/remote/modules/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service
index 14ff7457..9882459f 100644
--- a/remote/modules/kdm/data/etc/systemd/system/kdm.service
+++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service
@@ -1,12 +1,9 @@
 [Unit]
 Description=KDM Display Manager
 Conflicts=getty@tty7.service
-After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service
+After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service activate-nss-ldap.service
 
 [Service]
 ExecStart=/usr/bin/kdm -nodaemon
 Restart=always
 IgnoreSIGPIPE=no
-
-[Install]
-Alias=display-manager.service
diff --git a/remote/modules/systemd/data/etc/systemd/system/network.target b/remote/modules/systemd/data/etc/systemd/system/network.target
new file mode 100644
index 00000000..0bc2a410
--- /dev/null
+++ b/remote/modules/systemd/data/etc/systemd/system/network.target
@@ -0,0 +1,13 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Network
+Documentation=man:systemd.special(7)
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
+ConditionPathExists=/run/udhcpc/network-ready
+
diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index 3cb6196a..1a038647 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -4,7 +4,6 @@ REQUIRED_LIBKMOD_VERSION="kmod-14"
 REQUIRED_LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${REQUIRED_LIBKMOD_VERSION}.tar.gz"
 REQUIRED_DISABLED_SERVICES="
 	tmp.mount
-	time-sync.target
 	systemd-random-seed-save.service
 	systemd-random-seed-load.service
 	systemd-readahead-collect.service
@@ -24,7 +23,7 @@ REQUIRED_DISABLED_SERVICES="
 	nss-user-lookup.target
 	systemd-initctl.service
 	systemd-initctl.socket
-	swap.target
+	umount.target
 "
 REQUIRED_BINARIES="
 			journalctl
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