summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild/rootfs/bin/fbguibin2374207 -> 2439112 bytes
-rwxr-xr-xbuild/rootfs/bin/load_fbgui.sh12
-rw-r--r--build/rootfs/etc/fbgui.conf1
-rwxr-xr-xbuild/rootfs/init5
4 files changed, 13 insertions, 5 deletions
diff --git a/build/rootfs/bin/fbgui b/build/rootfs/bin/fbgui
index 1c4b84d..ef7d202 100755
--- a/build/rootfs/bin/fbgui
+++ b/build/rootfs/bin/fbgui
Binary files differ
diff --git a/build/rootfs/bin/load_fbgui.sh b/build/rootfs/bin/load_fbgui.sh
index ca592b9..255365d 100755
--- a/build/rootfs/bin/load_fbgui.sh
+++ b/build/rootfs/bin/load_fbgui.sh
@@ -4,7 +4,13 @@ export QWS_MOUSE_PROTO=IntelliMouse:/dev/mice
export QWS_KEYBOARD=TTY:/dev/tty0
fbgui_options=""
[ $(grep -c debug /proc/cmdline) -ge 1 ] && fbgui_options="$fbgui_options -D 1"
-/bin/fbgui $fbgui_options 2>/dev/null
+trigger=$(cat /etc/fbgui.conf | grep file_trigger | cut -d '=' -f2)
+[ ! -f $trigger ] && /bin/fbgui $fbgui_options 2>/dev/null
[ -f "/tmp/debuglevel" ] && . /tmp/debuglevel
-
-[ $DEBUGLEVEL -ge 1 ] && /bin/sh
+if [ $DEBUGLEVEL -ge 1 ]
+then
+ logfile=$(cat /etc/fbgui.conf | grep log_file | cut -d '=' -f2)
+ echo "fbgui debug mode skipped kexec execution."
+ echo "Consult $logfile for details."
+ /bin/sh
+fi
diff --git a/build/rootfs/etc/fbgui.conf b/build/rootfs/etc/fbgui.conf
index 27330d6..af0b39f 100644
--- a/build/rootfs/etc/fbgui.conf
+++ b/build/rootfs/etc/fbgui.conf
@@ -5,3 +5,4 @@ update_interval=5
file_trigger=/tmp/fbgui_trigger
serial_location=/serial
ip_config=/tmp/ip_config
+log_file=/tmp/fbgui.log
diff --git a/build/rootfs/init b/build/rootfs/init
index 2fef65f..ca938af 100755
--- a/build/rootfs/init
+++ b/build/rootfs/init
@@ -96,9 +96,10 @@ cat /etc/issue
if [ $DEBUGLEVEL -ge 1 ]; then
echo "DEBUGLEVEL=$DEBUGLEVEL" > /tmp/debuglevel
-echo "starting debug shell: "
+echo -n "Starting debug shell: "
+echo "CTRL + D will start fbgui"
/bin/sh
fi
-echo "start init" > /dev/klog
+echo "Start init" > /dev/klog
exec /sbin/init