summaryrefslogtreecommitdiffstats
path: root/remote/rootfs/rootfs-stage32
diff options
context:
space:
mode:
authorSimon Rettberg2014-01-31 17:52:13 +0100
committerSimon Rettberg2014-01-31 17:52:13 +0100
commita23d116d8145e4d80f778f55030dff5173aabe19 (patch)
tree45bac5ee73798ce56590c1b60d2843555ed2d64e /remote/rootfs/rootfs-stage32
parent[smbclient] new module for smbclient stuff (diff)
downloadtm-scripts-a23d116d8145e4d80f778f55030dff5173aabe19.tar.gz
tm-scripts-a23d116d8145e4d80f778f55030dff5173aabe19.tar.xz
tm-scripts-a23d116d8145e4d80f778f55030dff5173aabe19.zip
[rfs-stage32] Fix stage4.target triggering/ordering
Diffstat (limited to 'remote/rootfs/rootfs-stage32')
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service3
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/stage4.target4
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage43
3 files changed, 5 insertions, 5 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
index 15725f8f..7f8b54a8 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
@@ -1,8 +1,9 @@
[Unit]
Description=Mount Openslx Stage 4
DefaultDependencies=no
-Wants=setup-dnbd3.service
+Wants=setup-dnbd3.service stage4.target
After=setup-dnbd3.service
+Before=stage4.target
[Service]
Type=oneshot
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/stage4.target b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/stage4.target
index 465a324c..2b829854 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/stage4.target
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/stage4.target
@@ -1,3 +1,5 @@
[Unit]
-
+Wants=mount-stage4.service
+After=mount-stage4.service
Description=OpenSLX Stage 4
+RefuseManualStart=yes
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
index d0a3bc29..1b7935c7 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
@@ -60,8 +60,5 @@ fi
# dbus reload needed eg. for gnome etc. and perhaps other service files which stage4 needs:
systemctl reload dbus.service
-# tell systemd that stage4 was reached.
-systemctl start stage4.target &
-
exit 0