summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorSimon Rettberg2013-09-13 16:55:32 +0200
committerSimon Rettberg2013-09-13 16:55:32 +0200
commit83f28589be57154add7db07d7c359c7cb2e95eae (patch)
tree5b65b660d89a19a245b3e41ed68a846e27ea90d5 /remote/rootfs
parentMerge branch 'master' of simonslx:openslx-ng/tm-scripts (diff)
downloadtm-scripts-83f28589be57154add7db07d7c359c7cb2e95eae.tar.gz
tm-scripts-83f28589be57154add7db07d7c359c7cb2e95eae.tar.xz
tm-scripts-83f28589be57154add7db07d7c359c7cb2e95eae.zip
[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
Diffstat (limited to 'remote/rootfs')
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service4
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service5
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service2
3 files changed, 6 insertions, 5 deletions
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]