summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
Diffstat (limited to 'remote/rootfs')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init6
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/fbsplash.service10
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service2
3 files changed, 18 insertions, 0 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 198f8913..a4de8131 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -115,6 +115,12 @@ for mnt in proc sys run ; do
busybox umount -f -l "/$mnt" 2>/dev/null
done
+# make sure the splash screen is restarted in stage32
+if [ "$SPLASH" -eq 1 ]; then
+ ln -s "../fbsplash.service" "${FUTURE_ROOT}/etc/systemd/system/sysinit.target.wants/fbsplash.service"
+ killall fbsplash
+fi
+
echo "Switching root...."
echo "$bench_result" > "${FUTURE_ROOT}/opt/openslx/.benchmark"
# Prepare environment (HOME is needed as a hack for nss_ldap with ssl and no caching)
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/fbsplash.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/fbsplash.service
new file mode 100644
index 00000000..39d56ec0
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/fbsplash.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Revive fbsplash splash-screen
+DefaultDependencies=no
+After=systemd-tmpfiles-setup-dev.service
+Before=sysinit.target
+
+[Service]
+ExecStart=/opt/openslx/sbin/fbsplash -x -c -s /etc/splash.ppm
+ExecStop=/opt/openslx/usr/bin/killall fbsplash
+
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service
index c3e088c8..1759b798 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service
@@ -5,6 +5,8 @@ DefaultDependencies=no
[Service]
Type=oneshot
+ExecStart=-/usr/bin/systemctl stop fbsplash.service
ExecStart=-/opt/openslx/usr/bin/killall fbsplash
ExecStart=/opt/openslx/bin/true
RemainAfterExit=no
+