diff options
| author | Simon Rettberg | 2014-07-09 17:52:36 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-07-09 17:52:36 +0200 |
| commit | 18d2088fee09cac5f0ce4c8de203c2a7cb239efa (patch) | |
| tree | 950dfcd04e550d40d44c3d6e91b09b8db531bcac /remote | |
| parent | [Testing] added x11vnc module for testing pruposes (diff) | |
| download | tm-scripts-18d2088fee09cac5f0ce4c8de203c2a7cb239efa.tar.gz tm-scripts-18d2088fee09cac5f0ce4c8de203c2a7cb239efa.tar.xz tm-scripts-18d2088fee09cac5f0ce4c8de203c2a7cb239efa.zip | |
[rfs-stage31] Fix cursor hiding if showing splash
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 2 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 35834d52..eb0e6d99 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -67,7 +67,7 @@ HEREEND rm -rf -- "${TEMP_EXTRACT_DIR}" [ $DEBUG -eq 0 ] && rm -f -- "${CONFIG}.tgz" # Display branding logo if splash screen is shown - [ "x${MUTED_OUTPUT}" = "x1" ] && [ -e "${FUTURE_ROOT}/etc/branding.ppm" ] && fbsplash -c -s "${FUTURE_ROOT}/etc/branding.ppm" & + [ "x${MUTED_OUTPUT}" = "x1" ] && [ -e "${FUTURE_ROOT}/etc/branding.ppm" ] && fbsplash -s "${FUTURE_ROOT}/etc/branding.ppm" & } diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index f6a99cf6..8dd0c529 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -50,16 +50,15 @@ 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" clear + echo -e "\033[?25l" >&4 if [ -e "/etc/splash.ppm.gz" ]; then - fbsplash -x -b -c -s "/etc/splash.ppm.gz" & + fbsplash -x -b -s "/etc/splash.ppm.gz" & elif [ -e "/etc/splash.ppm" ]; then - fbsplash -x -b -c -s "/etc/splash.ppm" & + fbsplash -x -b -s "/etc/splash.ppm" & else echo "Splash screen requested, but not found in initramfs..." >&4 fi - echo -e "\033[?25l" fi else setup_gfx |