diff options
Diffstat (limited to 'remote/rootfs')
4 files changed, 1 insertions, 29 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index a4de8131..b3681eee 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -63,6 +63,7 @@ if [ "$SPLASH" -eq 1 ]; then echo "1 1 0 1" > /proc/sys/kernel/printk exec 4>&1 5>&2 > /dev/null 2>&1 MUTED_OUTPUT=1 + echo -e "\033[?25l" setsid fbsplash -x -c -s /etc/splash.ppm & fi else @@ -115,12 +116,6 @@ 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 deleted file mode 100644 index 39d56ec0..00000000 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/fbsplash.service +++ /dev/null @@ -1,10 +0,0 @@ -[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/getty.target.wants/killsplash.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/getty.target.wants/killsplash.service deleted file mode 120000 index 40a962d5..00000000 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/getty.target.wants/killsplash.service +++ /dev/null @@ -1 +0,0 @@ -../killsplash.service
\ No newline at end of file diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service deleted file mode 100644 index 1759b798..00000000 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Stop splash screen -Before=getty.target graphical.target -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 - |