From 3d868571104f9a6a5c7a13280586466c5ce17faf Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 26 Aug 2011 18:46:50 +0000
Subject: main/openrc: look for firmware within the modloop

ref #739
---
 main/openrc/APKBUILD      | 4 ++--
 main/openrc/modloop.initd | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'main')

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
 }
 
-- 
cgit v1.2.3