Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse fbcon command line option #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Parse fbcon command line option #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions init
View file
Open in desktop
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