summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-08-26 18:46:50 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-08-26 18:46:50 +0000
commit3d868571104f9a6a5c7a13280586466c5ce17faf (patch)
tree8b95ccda2fe0440db0d81a1657078a214a8b77d6 /main
parent9e9307da3c2d4361488bdf10602dd190bc855119 (diff)
downloadaports-3d868571104f9a6a5c7a13280586466c5ce17faf.tar.bz2
aports-3d868571104f9a6a5c7a13280586466c5ce17faf.tar.xz
main/openrc: look for firmware within the modloop
ref #739
Diffstat (limited to 'main')
-rw-r--r--main/openrc/APKBUILD4
-rw-r--r--main/openrc/modloop.initd3
2 files changed, 5 insertions, 2 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 1170048f5..7723ca831 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.8.3
_ver=${pkgver/_git*/}
-pkgrel=4
+pkgrel=5
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
arch="all"
@@ -77,6 +77,6 @@ c32e15b0858eef708497e7ee6355a055 hostname.initd
b1e64885f301166df30be3e3cf5338ff hwdrivers.initd
33ca3e558c42cdd17adccbc7807298f7 keymaps.initd
098a1f16812f56fcb56eb6b6f0fa31f6 modules.initd
-e9dae56ec441a9d3f1013863751c0e52 modloop.initd
+9b4b72543d80e7bef5fc677ebc6c64ef modloop.initd
af16db0d798392c7c0ed3434e4bad241 networking.initd
c1ec888202d868710b5749f7b217d1e3 modloop.confd"
diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd
index 1a12f6fcc..d2cff4e6a 100644
--- a/main/openrc/modloop.initd
+++ b/main/openrc/modloop.initd
@@ -106,6 +106,9 @@ start() {
ebegin "Copying firmware from $alpine_mnt/firmware"
cp -R -a $alpine_mnt/firmware /lib/
eend $?
+ elif [ -d /lib/modules/firmware ]; then
+ rmdir /lib/firmware 2>/dev/null \
+ && ln -s /lib/modules/firmware /lib/
fi
}