summaryrefslogtreecommitdiffstats
path: root/remote/rootfs/rootfs-stage31/data
diff options
context:
space:
mode:
authorSimon Rettberg2014-02-26 11:37:36 +0100
committerSimon Rettberg2014-02-26 11:37:36 +0100
commit0dc4905aa03ff17d0f19dc80c7ebcee38e7d8c55 (patch)
treece74b10a3443fa157d5356d9a92612e3c0d2386a /remote/rootfs/rootfs-stage31/data
parentRestart splash screen in stage32 (if booting with splashscreen enabled) (diff)
downloadtm-scripts-0dc4905aa03ff17d0f19dc80c7ebcee38e7d8c55.tar.gz
tm-scripts-0dc4905aa03ff17d0f19dc80c7ebcee38e7d8c55.tar.xz
tm-scripts-0dc4905aa03ff17d0f19dc80c7ebcee38e7d8c55.zip
Tweaked fbsplash to survive switch_root, kill it before spawning getty or kdm
Diffstat (limited to 'remote/rootfs/rootfs-stage31/data')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init7
1 files changed, 1 insertions, 6 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)