summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service10
l---------[-rw-r--r--]remote/rootfs/rootfs-stage32/data/etc/systemd/system/nfs-mount.service11
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/stage4.target3
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 (renamed from remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export)4
l---------server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/mount-stage4.service1
l---------server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/nfs-mount.service1
6 files changed, 19 insertions, 11 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
new file mode 100644
index 00000000..15725f8f
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Mount Openslx Stage 4
+DefaultDependencies=no
+Wants=setup-dnbd3.service
+After=setup-dnbd3.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/opt/openslx/scripts/systemd-mount_stage4
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/nfs-mount.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/nfs-mount.service
index 3deb3def..c1792e42 100644..120000
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/nfs-mount.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/nfs-mount.service
@@ -1,10 +1 @@
-[Unit]
-Description=Mount NFS Share [TEST]
-DefaultDependencies=no
-Wants=setup-dnbd3.service
-After=setup-dnbd3.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/opt/openslx/scripts/systemd-mount_export
+mount-stage4.service \ No newline at end of file
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/stage4.target b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/stage4.target
new file mode 100644
index 00000000..465a324c
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/stage4.target
@@ -0,0 +1,3 @@
+[Unit]
+
+Description=OpenSLX Stage 4
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
index 4c8597a9..abc28f73 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
@@ -58,3 +58,7 @@ 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
diff --git a/server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/mount-stage4.service b/server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/mount-stage4.service
new file mode 120000
index 00000000..80390894
--- /dev/null
+++ b/server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/mount-stage4.service
@@ -0,0 +1 @@
+../mount-stage4.service \ No newline at end of file
diff --git a/server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/nfs-mount.service b/server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/nfs-mount.service
deleted file mode 120000
index 1936daef..00000000
--- a/server/modules/stage4-at-boot/etc/systemd/system/basic.target.wants/nfs-mount.service
+++ /dev/null
@@ -1 +0,0 @@
-../nfs-mount.service \ No newline at end of file