Skip to content

Commit

Permalink
Parse fbcon command line option
Browse files Browse the repository at this point in the history
Fix machybris issue
  • Loading branch information
BalintBanyasz committed Apr 24, 2016
1 parent 2c11702 commit 2ab5217
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions init
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#!/bin/sh

insmod font.ko
insmod softcursor.ko
insmod bitblit.ko
insmod fbcon.ko

[ -d /dev ] || mkdir -m 0755 /dev
[ -d /root ] || mkdir -m 0700 /root
[ -d /sys ] || mkdir /sys
Expand Down Expand Up @@ -61,6 +56,7 @@ export blacklist=
export resume=
export resume_offset=
export recovery=
export fbcon=y

# mdadm needs hostname to be set. This has to be done before the udev rules are called!
if [ -f "/etc/hostname" ]; then
Expand Down Expand Up @@ -219,9 +215,19 @@ for x in $(cat /proc/cmdline); do
recovery)
recovery=y
;;
fbcon=vc:64-63)
fbcon=n
;;
esac
done

if [ "$fbcon" = "y" ]; then
insmod font.ko
insmod softcursor.ko
insmod bitblit.ko
insmod fbcon.ko
fi

case "$ROOT" in
*mtd*)
insmod /rk30xxnand-3.0.36+.ko
Expand Down Expand Up @@ -362,6 +368,7 @@ unset quiet
unset readonly
unset resume
unset resume_offset
unset fbcon

# Chain to real filesystem
exec run-init ${rootmnt} ${init} "$@" ${recovery:+--startup-event=recovery} <${rootmnt}/dev/console >${rootmnt}/dev/console 2>&1
Expand Down

0 comments on commit 2ab5217

Please sign in to comment.