From ab0a08bd0106ce966db6049ca05a0ef7133c7ae0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 24 Jan 2017 11:10:44 +0000
Subject: [PATCH] main/openrc: fix hwdrivers to load fbcon on /dev/fb0
Instead of checking for fb module we check for /dev/fb0 since we now
compile fb directly into the kernel instead of module.
We also allow blacklisting it by using `modprobe -b`
---
main/openrc/APKBUILD | 8 ++++----
main/openrc/hwdrivers.initd | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 137dc80ae344..85ad939b5e8e 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.21.7
_ver=${pkgver/_git*/}
-pkgrel=3
+pkgrel=4
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
arch="all"
@@ -82,7 +82,7 @@ f402d67b185803ea899053c3bccfc87c 0006-rc-pull-in-sysinit-and-boot-as-stacked-le
fdb251e2c6cdc7ec6911bc5dbac88ac3 0008-make-consolefont-service-compatible-with-busyboxs-se.patch
d83df5513f08f09fa9e7353327701bf7 openrc.logrotate
60b4cf93ca19aff577fd743ab42878a8 hostname.initd
-887eba592d487d6ffe2b42cfcd2813df hwdrivers.initd
+dddb3d66d87e4cc503c8513e7b0e666a hwdrivers.initd
41974f5408fd2e92892f891b58f2e49f keymaps.initd
1737a6fc5376f924230d173f5c7345d0 modules.initd
30f26648981f986e502f75f78fa77df8 modloop.initd
@@ -100,7 +100,7 @@ cd35c4040a9b21da394c598a8996390dab1c520e93e84707014094ab82827163 0007-mount-efi
bddeb20a3bfba12b7e8d88cb75143e301e49a47c06235483f500565eff64310c 0008-make-consolefont-service-compatible-with-busyboxs-se.patch
30a81fb2f761083088d4d6a3d435fc842966d44588e9837b45ffd03e48be6eb6 openrc.logrotate
dda515d7d906cebcf4137746939f3fdccc7f504fe097ef1dbf429e3e6773a013 hostname.initd
-6cb4d9ea3ad562bcf2697f61f5a76a10481d23f5dead570f82eff576eaca5236 hwdrivers.initd
+381ba933e6bc545a738ca0d12de9052e90381a850c4a5682b8603f00be64ac81 hwdrivers.initd
32562d39ade4092df8163c2e8cf0b31eeec06aa5713d343e1c487bfa6d9f7c84 keymaps.initd
77b377575563df74d0e3fede5e6171c6eeec974fe487d0e47cccc5e0ed60ec2d modules.initd
af015110acf1f24024f2c21e69042a5ac313c90c88bfb1a653d03d33721c9929 modloop.initd
@@ -118,7 +118,7 @@ e1d23634e7b6d68c488efefa5a4c5b1ca59385eaab298bd3ac88903f60dd5b20d634da4c837c5a2f
ee9152339674d4cf5609f01a110938ed9817b719679466d71a3ddf192ccaaceb1a7a49a09c2f4f51ec19b85ec9c0ec2ff68765013d8350b9d0d8671e509d5c55 0008-make-consolefont-service-compatible-with-busyboxs-se.patch
12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate
99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd hostname.initd
-b51d95df7b692aaea3e14ed009d99b46b82500d505e2eeecb6a20136cee140aea4a7377a65ccc5c51fff64be7a50666be48616d179888eaeff9d35178a7a772b hwdrivers.initd
+c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55 hwdrivers.initd
584ecbbcecb284527d7616790b6e337ace610e4b3cedf2993eca294bfbef54674aeaee3078b6c17d746a0c48b5a64a813c3534136915947e6f62a6fa206cd3ca keymaps.initd
b04058ec630e19de0bafefe06198dc1bff8c8d5d2c89e4660dd83dda8bb82a76cdb1d8661cce88e4a406aa6b4152e17efff52d3eb18ffaec0751d0b6cdbcc48a modules.initd
a0ac5eba5001f20031ae4ef7439fb1e7ffffde1a2c47cfa4e9cab93f8f2e03e06a50c51b42d432e91d88f48a2207db5883f4b3c2be5911b1b255cc81f8b00725 modloop.initd
diff --git a/main/openrc/hwdrivers.initd b/main/openrc/hwdrivers.initd
index eda9b6581087..80184c9710b2 100644
--- a/main/openrc/hwdrivers.initd
+++ b/main/openrc/hwdrivers.initd
@@ -23,8 +23,8 @@ start() {
| xargs modprobe -b -a 2> /dev/null
# check if framebuffer drivers got pulled in
- if [ -e /sys/module/fb ] && ! [ -e /sys/module/fbcon ]; then
- modprobe fbcon
+ if [ -e /dev/fb0 ] && ! [ -e /sys/module/fbcon ]; then
+ modprobe -b -q fbcon
fi
eend 0
--
GitLab