diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-26 13:53:23 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-26 13:53:23 +0000 |
| commit | 8427257b986105d09c4c287e739af152dc6ccfce (patch) | |
| tree | 7ae53b3aeaf583343fc908fb34c4c4a370c6feab /initramfs-init.in | |
| parent | 8785cfa9ce642d8b4cde64ea0e4c497aa55a5780 (diff) | |
| download | mkinitfs-8427257b986105d09c4c287e739af152dc6ccfce.tar.bz2 mkinitfs-8427257b986105d09c4c287e739af152dc6ccfce.tar.xz | |
init: fix loading of fbcon
we check if /sys/class/graphics/fb0 exists before loading fbcon and
allow user to disable tiwh nofbcon as boot option
Diffstat (limited to 'initramfs-init.in')
| -rwxr-xr-x | initramfs-init.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/initramfs-init.in b/initramfs-init.in index 7831995..4b010f6 100755 --- a/initramfs-init.in +++ b/initramfs-init.in @@ -386,7 +386,7 @@ eval set -- `cat /proc/cmdline` myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm debug_init dma init_args keep_apk_new modules ovl_dev pkgs quiet root_size root - usbdelay ip alpine_repo apkovl alpine_start" + usbdelay ip alpine_repo apkovl alpine_start nofbcon" for opt; do case "$opt" in @@ -524,11 +524,11 @@ scan_drivers scan_drivers eend 0 -ebegin "Setting up framebuffer console" -if [ -d /lib/modules/`uname -r`/kernel/drivers/gpu ]; then +if [ -z "$KOPT_nofbcon" ] && [ -e /sys/class/graphics/fb0 ]; then + ebegin "Setting up framebuffer console" modprobe -q fbcon &>/dev/null + eend 0 fi -eend 0 # check if root=... was set if [ -n "$KOPT_root" ]; then |