diff --git a/packages/jelos/sources/autostart/autostart b/packages/jelos/sources/autostart/autostart index 519ae60dc..7edc7e766 100755 --- a/packages/jelos/sources/autostart/autostart +++ b/packages/jelos/sources/autostart/autostart @@ -41,7 +41,7 @@ then done fi -clear >/dev/console +/usr/bin/show_splash intro 2>&1 >>${BOOTLOG} DEVICE_CPU_GOVERNOR=$(get_setting system.cpugovernor) ${DEVICE_CPU_GOVERNOR} 2>&1 >>${BOOTLOG} diff --git a/packages/jelos/sources/autostart/common/004-upgrade b/packages/jelos/sources/autostart/common/004-upgrade index 7f2939709..d2cae955c 100755 --- a/packages/jelos/sources/autostart/common/004-upgrade +++ b/packages/jelos/sources/autostart/common/004-upgrade @@ -15,6 +15,3 @@ then rm /storage/.config/boot.hint touch /storage/.configured fi - -clear >/dev/console -/usr/bin/show_splash intro 2>&1 >/dev/null diff --git a/packages/jelos/sources/scripts/run b/packages/jelos/sources/scripts/run index 2352475a2..5f8f90e9a 100755 --- a/packages/jelos/sources/scripts/run +++ b/packages/jelos/sources/scripts/run @@ -6,7 +6,9 @@ then weston-terminal --command="${1}" else systemctl stop ${UI_SERVICE} - ${1} >/dev/console 2>&1 + exec 1>/dev/console + exec 2>/dev/null + ${1} fi if [ ! "${UI_SERVICE}" = "weston.service" ] then diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 4c09455d3..23cfa29c0 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -54,7 +54,8 @@ BIGFONT="1080" TEE_PID="" -exec >/dev/console 2>&1 +exec 1>/dev/console +exec 2>/dev/null # common functions . /functions 2>/dev/null @@ -704,10 +705,10 @@ mount_games() { /usr/bin/busybox mkdir -p /storage/roms >/dev/null 2>&1 fi - for DEV in $(blkid | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ {print $1}' | sort -r) + for DEV in $(blkid | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ {print $1}' 2>/dev/null | sort -r) do - ROOTDEV=$(echo ${DEV} | sed -e "s#^/.*/##g" -e "s#p[0-9].*\$##g") - SIZE=$(awk '/'${ROOTDEV}'/ {print $3}' /proc/partitions) + ROOTDEV=$(echo ${DEV} | sed -e "s#^/.*/##g" -e "s#p[0-9].*\$##g" 2>/dev/null) + SIZE=$(awk '/'${ROOTDEV}'/ {print $3}' /proc/partitions 2>/dev/null) if [ "${SIZE}" -le "8388608" ] then # We don't want to mount partitions smaller than ~8GB. diff --git a/packages/wayland/weston/patches/002-console.patch b/packages/wayland/weston/patches/002-console.patch index 8f167afcf..9a167ea06 100644 --- a/packages/wayland/weston/patches/002-console.patch +++ b/packages/wayland/weston/patches/002-console.patch @@ -16,7 +16,7 @@ diff -rupN weston-10.0.1.orig/clients/terminal.c weston-10.0.1/clients/terminal. setenv("COLORTERM", option_term, 1); + + if (option_command) { -+ if (execl(path, path, "-c", option_command, NULL)) { ++ if (execl(path, path, "-e", option_command, NULL)) { + fprintf(stderr, "command '%s' couldn't executed: %m", + option_command); + }