diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-26 18:46:50 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-26 18:46:50 +0000 |
commit | 3d868571104f9a6a5c7a13280586466c5ce17faf (patch) | |
tree | 8b95ccda2fe0440db0d81a1657078a214a8b77d6 | |
parent | 9e9307da3c2d4361488bdf10602dd190bc855119 (diff) | |
download | alpine_aports-3d868571104f9a6a5c7a13280586466c5ce17faf.tar.bz2 alpine_aports-3d868571104f9a6a5c7a13280586466c5ce17faf.tar.xz alpine_aports-3d868571104f9a6a5c7a13280586466c5ce17faf.zip |
main/openrc: look for firmware within the modloop
ref #739
-rw-r--r-- | main/openrc/APKBUILD | 4 | ||||
-rw-r--r-- | main/openrc/modloop.initd | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 1170048f58..7723ca8312 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | pkgname=openrc | 2 | pkgname=openrc |
3 | pkgver=0.8.3 | 3 | pkgver=0.8.3 |
4 | _ver=${pkgver/_git*/} | 4 | _ver=${pkgver/_git*/} |
5 | pkgrel=4 | 5 | pkgrel=5 |
6 | pkgdesc="OpenRC manages the services, startup and shutdown of a host" | 6 | pkgdesc="OpenRC manages the services, startup and shutdown of a host" |
7 | url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" | 7 | url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" |
8 | arch="all" | 8 | arch="all" |
@@ -77,6 +77,6 @@ c32e15b0858eef708497e7ee6355a055 hostname.initd | |||
77 | b1e64885f301166df30be3e3cf5338ff hwdrivers.initd | 77 | b1e64885f301166df30be3e3cf5338ff hwdrivers.initd |
78 | 33ca3e558c42cdd17adccbc7807298f7 keymaps.initd | 78 | 33ca3e558c42cdd17adccbc7807298f7 keymaps.initd |
79 | 098a1f16812f56fcb56eb6b6f0fa31f6 modules.initd | 79 | 098a1f16812f56fcb56eb6b6f0fa31f6 modules.initd |
80 | e9dae56ec441a9d3f1013863751c0e52 modloop.initd | 80 | 9b4b72543d80e7bef5fc677ebc6c64ef modloop.initd |
81 | af16db0d798392c7c0ed3434e4bad241 networking.initd | 81 | af16db0d798392c7c0ed3434e4bad241 networking.initd |
82 | c1ec888202d868710b5749f7b217d1e3 modloop.confd" | 82 | c1ec888202d868710b5749f7b217d1e3 modloop.confd" |
diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd index 1a12f6fccd..d2cff4e6a3 100644 --- a/main/openrc/modloop.initd +++ b/main/openrc/modloop.initd | |||
@@ -106,6 +106,9 @@ start() { | |||
106 | ebegin "Copying firmware from $alpine_mnt/firmware" | 106 | ebegin "Copying firmware from $alpine_mnt/firmware" |
107 | cp -R -a $alpine_mnt/firmware /lib/ | 107 | cp -R -a $alpine_mnt/firmware /lib/ |
108 | eend $? | 108 | eend $? |
109 | elif [ -d /lib/modules/firmware ]; then | ||
110 | rmdir /lib/firmware 2>/dev/null \ | ||
111 | && ln -s /lib/modules/firmware /lib/ | ||
109 | fi | 112 | fi |
110 | } | 113 | } |
111 | 114 | ||