diff options
| author | Simon Rettberg | 2014-07-05 16:31:46 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-07-05 16:31:46 +0200 |
| commit | 2f724e0ffd3ddc34bb5459f5f5fbd31b08e2727a (patch) | |
| tree | 4b16adb0085b84aca8396554a1864ca3cfc9ad48 /remote/rootfs | |
| parent | [branding-freiburg] Add ppm (diff) | |
| download | tm-scripts-2f724e0ffd3ddc34bb5459f5f5fbd31b08e2727a.tar.gz tm-scripts-2f724e0ffd3ddc34bb5459f5f5fbd31b08e2727a.tar.xz tm-scripts-2f724e0ffd3ddc34bb5459f5f5fbd31b08e2727a.zip | |
[stage31] Made splash-screen nicer
Diffstat (limited to 'remote/rootfs')
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 6 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 5a97d7ac..35834d52 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -21,7 +21,7 @@ fetch_sysconfig() { } ######################################################################### # -# This function downloads the config.tgz and unpacks it to $TARGET_PATH +# This function downloads the config.tgz and unpacks it to $TARGET_PATH <-- no it doesn't! # fetch_config_files() { [ -e "${CONFIG}.tgz" ] && echo "config.tgz already downloaded." && exit 0 @@ -33,7 +33,7 @@ fetch_config_files() { ######################################################################### # # This function updates the downloaded config with the IP information -# received from /inc/setup_network +# received from /inc/setup_network <-- plus 500 other things update_sysconfig() { # sanity checks [ ! -e "${CONFIG}" ] && { echo "Cannot update. '$CONFIG' does not exist."; return 1; } @@ -66,6 +66,8 @@ HEREEND cd / 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" & } diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 699c68ff..91ae5d43 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -51,7 +51,12 @@ if [ "$SPLASH" -eq 1 ]; then exec 4>&1 5>&2 > /dev/null 2>&1 MUTED_OUTPUT=1 echo -e "\033[?25l" - setsid fbsplash -x -c -s /etc/splash.ppm & + clear + if [ -e "/etc/splash.ppm.gz" ]; then + fbsplash -x -b -c -s "/etc/splash.ppm.gz" & + else + fbsplash -x -b -c -s "/etc/splash.ppm" & + fi fi else setup_gfx |